e343a04eea 
								
							
								 
							
						 
						
							
							
								
								Merge commit '18b5b7c046436f2defab2e20407e22da180bf97b' into signal-1.22  
							
							... 
							
							
							
							# Conflicts:
#	app/sql.js
#	background.html
#	config/default.json
#	js/background.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/modules/data.js
#	js/signal_protocol_store.js
#	js/views/conversation_search_view.js
#	libtextsecure/message_receiver.js
#	libtextsecure/sendmessage.js
#	main.js
#	package.json
#	preload.js
#	test/index.html
#	ts/components/Avatar.tsx
#	ts/components/conversation/ConversationHeader.md
#	ts/components/conversation/ConversationHeader.tsx 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								041fe4be05 
								
							
								 
							
						 
						
							
							
								
								Remove JSON column and Backbone Model for unprocessed  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9c540ab977 
								
							
								 
							
						 
						
							
							
								
								Add cache support to Signal Protocol Store  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e1aba93aea 
								
							
								 
							
						 
						
							
							
								
								Merge signal 1.18.1 changes.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								eb7a0dbb3a 
								
							
								 
							
						 
						
							
							
								
								Fix failing tests except for problematic spellcheck package  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								11fdf22881 
								
							
								 
							
						 
						
							
							
								
								Change sessions.id to a TEXT field to prevent type coercion  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bde1462159 
								
							
								 
							
						 
						
							
							
								
								Change sessions.id to a TEXT field to prevent type coercion  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dbf0be2db5 
								
							
								 
							
						 
						
							
							
								
								eslintify all test files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1755e0adfd 
								
							
								 
							
						 
						
							
							
								
								Move all remaining stores to SQLCipher  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7983300f4a 
								
							
								 
							
						 
						
							
							
								
								Use base64 strings for incoming message cache instead of binary  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cfe0bd0e79 
								
							
								 
							
						 
						
							
							
								
								Move to npm for several dependencies  
							
							... 
							
							
							
							mustache
jQuery
underscore
backbone
mocha
chai
intl-tel-input 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								1dd87ad197 
								
							
								 
							
						 
						
							
							
								
								Format all source code using Prettier  
							
							
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								a728c9efbf 
								
									
								
							
								 
							
						 
						
							
							
								
								Remove all mention of obsolete safety-number-approval setting  
							
							
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								ef3431af1b 
								
							
								 
							
						 
						
							
							
								
								isUntrusted: Return false if firstUse is true  
							
							... 
							
							
							
							Because users will see this upon first trying to communicate with a new
contact if they're quick about it.
FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								bd0050b6c6 
								
							
								 
							
						 
						
							
							
								
								Cache messages on receipt, remove from cache when processed  
							
							... 
							
							
							
							FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								91f50c028f 
								
							
								 
							
						 
						
							
							
								
								Unify processVerifiedMessage with Java implementation  
							
							... 
							
							
							
							This removes our support for the New Key/DEFAULT case, which iOS will
sync to us. Why? Because it ensures that in out of date scenarios, we
don't lose the higher-security state we were in previously.
FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								c10e1b4ad0 
								
							
								 
							
						 
						
							
							
								
								Code coverage test run: Fix broken test  
							
							... 
							
							
							
							This test failed only under code coverage runs - because start up of the
page too took long!
FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								f654532fa8 
								
							
								 
							
						 
						
							
							
								
								Handle UNVERIFIED sync verification messages (via contact sync)  
							
							... 
							
							
							
							FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								20451cc827 
								
							
								 
							
						 
						
							
							
								
								Show verified/keychange notifications when actually relevant  
							
							... 
							
							
							
							FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								877f092b2c 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							... 
							
							
							
							saveIdentity now requires a full protocol address string
// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								0056cbefc1 
								
							
								 
							
						 
						
							
							
								
								processVerifiedMessage: Trigger keychange event when key differs  
							
							... 
							
							
							
							FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								5d5805526a 
								
							
								 
							
						 
						
							
							
								
								Fix a test  
							
							... 
							
							
							
							Set the timestamp on the record to current time to ensure that
nonblockingApproval will be required.
// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								f15fadbb4d 
								
							
								 
							
						 
						
							
							
								
								Test processVerifiedMessage  
							
							
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								044e1560e0 
								
							
								 
							
						 
						
							
							
								
								Test new setVerified behavior  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								33b4d398d6 
								
							
								 
							
						 
						
							
							
								
								Fix indentation  
							
							
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								51080141cd 
								
							
								 
							
						 
						
							
							
								
								Update identity store tests  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								27692b4dfc 
								
							
								 
							
						 
						
							
							
								
								Normalize whitespace in storage tests  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								c6bfdec84d 
								
							
								 
							
						 
						
							
							
								
								Remove blockingApproval  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								1eec94dbb7 
								
							
								 
							
						 
						
							
							
								
								Update tests for saveIdentity  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								ba3a6efb12 
								
							
								 
							
						 
						
							
							
								
								Add tests for all the new isTrusted behaviors  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								2584f4fae4 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								82469713d2 
								
							
								 
							
						 
						
							
							
								
								Update saveIdentity  
							
							... 
							
							
							
							Add support new blockingApproval and nonblockingApproval arguments
Populate the firstUse property on identity key records
Return whether an existing record was overwritten.
References
https://github.com/WhisperSystems/Signal-Android/commit/39d4a7#diff-69ede72c549da6bcbcd959935995b7e9R45 
// FREEBIE 
							
						 
						
							8 years ago  
				
					
						
							
							
								 
						
							
							
								16f3717824 
								
							
								 
							
						 
						
							
							
								
								Move refresh prekeys out of SignalProtocolStore  
							
							... 
							
							
							
							Use an event/listener instead
// FREEBIE 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								3cfac58d78 
								
							
								 
							
						 
						
							
							
								
								Eliminate all console errors during test run  
							
							... 
							
							
							
							FREEBIE 
							
						 
						
							9 years ago  
				
					
						
							
							
								 
						
							
							
								f8e176fd40 
								
							
								 
							
						 
						
							
							
								
								Dedupe methods  
							
							... 
							
							
							
							Define textsecure.crypto in terms of libsignal.crypto.
// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								148bd32671 
								
							
								 
							
						 
						
							
							
								
								Update libsignal-protocol v0.10.0  
							
							... 
							
							
							
							* Changes policy for old session deletion
* Renames putIdentityKey to saveIdentity
* Remove device messages
// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								6589ec544a 
								
							
								 
							
						 
						
							
							
								
								Unnest before statements  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								348ee0b3e7 
								
							
								 
							
						 
						
							
							
								
								More descriptive tests  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								f173104c82 
								
							
								 
							
						 
						
							
							
								
								Tests for isTrustedIdentity  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								1d60dc38fb 
								
							
								 
							
						 
						
							
							
								
								Rename axolotl storage  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								b1d370755a 
								
							
								 
							
						 
						
							
							
								
								Rename AxolotlStore  
							
							... 
							
							
							
							// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								1fe5d63015 
								
							
								 
							
						 
						
							
							
								
								Update protocol libs  
							
							... 
							
							
							
							Rename storage functions
// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								173e037fa6 
								
							
								 
							
						 
						
							
							
								
								Fix minor style errors  
							
							... 
							
							
							
							And keep it that way, by making jscs config more opinionated.
// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								80d32103d1 
								
							
								 
							
						 
						
							
							
								
								Clear session store when re-registering  
							
							... 
							
							
							
							When we re-register, our deviceId might change, which makes our sessions
are no longer valid since the recipient will see us as a new device.
Fixes  #388  
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								f764445c86 
								
							
								 
							
						 
						
							
							
								
								Remove erroneous license file and headers  
							
							... 
							
							
							
							We only use GPLV3 around here.
// FREEBIE 
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								17e515f886 
								
							
								 
							
						 
						
							
							
								
								Add identity key conflict tests  
							
							
							
						 
						
							10 years ago  
				
					
						
							
							
								 
						
							
							
								029c9754f0 
								
							
								 
							
						 
						
							
							
								
								Fix tests  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								915612114b 
								
							
								 
							
						 
						
							
							
								
								Remove general get/put/remove methods from AxolotlStore  
							
							
							
						 
						
							11 years ago  
				
					
						
							
							
								 
						
							
							
								f413f03a6b 
								
							
								 
							
						 
						
							
							
								
								Add getDeviceIds to axolotlstore  
							
							... 
							
							
							
							And add tests for getDeviceIds and removeAllSessions 
							
						 
						
							11 years ago