403df0806b 
								
							
								 
							
						 
						
							
							
								
								Update the production json to just use the defaults in preparation for having other people try the messenger. Also cleaned up a little log that was incorrect  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3fb6ab295f 
								
							
								 
							
						 
						
							
							
								
								Debug log optimizations and improvements  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								77ae717b9b 
								
							
								 
							
						 
						
							
							
								
								Clean up shutdown handling - stop processing incoming messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7c4ba5446c 
								
							
								 
							
						 
						
							
							
								
								Throw error if incoming attachment has mismatched attachment size  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dc67aaf9cc 
								
							
								 
							
						 
						
							
							
								
								Roll back change to ping more often again, ping our offline contacts every 2 mins to check if they have come back online  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								29bca71d5a 
								
							
								 
							
						 
						
							
							
								
								Try ping contacts that send us storage server messages in the last 2 mins  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d6a210efaa 
								
							
								 
							
						 
						
							
							
								
								Reworked the update p2p details to be more robust and stopped some redundant pings from happening  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2fd746821a 
								
							
								 
							
						 
						
							
							
								
								Added function for getting your loki IP and bind the local server  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2c3847affe 
								
							
								 
							
						 
						
							
							
								
								MessageReceiver: Don't wait for cache update to move forward  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5b54c9554e 
								
							
								 
							
						 
						
							
							
								
								Remove groups table, conversation is single source of truth  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b69eea543c 
								
							
								 
							
						 
						
							
							
								
								MessageReceiver: Don't wait for app logic to start next decrypt  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								041fe4be05 
								
							
								 
							
						 
						
							
							
								
								Remove JSON column and Backbone Model for unprocessed  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1d2c3ae23c 
								
							
								 
							
						 
						
							
							
								
								Download attachments in separate queue from message processing  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								021e807180 
								
							
								 
							
						 
						
							
							
								
								MessageReceiver: Log errors with proper message id  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fdc51e88dd 
								
							
								 
							
						 
						
							
							
								
								only verify the prekey id when there is no current session active  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2755ff06d8 
								
							
								 
							
						 
						
							
							
								
								remove messages from cache before throwing if the prekey id could not be verified  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7186f28019 
								
							
								 
							
						 
						
							
							
								
								Ensure a session is always initiated using the prekey assigned to the contact  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a0f67c22da 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'textsecure/master' into merge_1_21_0  
							
							... 
							
							
							
							* textsecure/master: (26 commits)
  v1.21.0
  v1.21.0-beta.4
  Dark Theme: Preserve blue background on app loading screen
  Localization updates
  Fix width of audio player when window is very narrow
  A number of small fixes for Link Previews
  Get rid of the white flash when the app starts up (#3083 )
  v1.21.0-beta.3
  Lint fixes
  Introduce new language: NB
  Fail over to all numbers in retry if errors don't have numbers
  Use the proper method for pulling attachments off disk for retry
  Fix rendering bug with verified state in updateVerified()
  Update electron-builder and electron-updater
  Ensure that dialog pops up when permissions denied for voice note
  Lint fixes
  Large update to localization strings
  Link Previews
  Ensure that blocked messages are dropped even after sealed sender
  Don't linkify quoted message contents
  ...
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	_locales/cs/messages.json
#	background.html
#	config/default.json
#	index.html
#	js/models/conversations.js
#	js/modules/web_api.js
#	js/settings_start.js
#	js/views/conversation_view.js
#	js/views/settings_view.js
#	package.json
#	protos/SignalService.proto
#	stylesheets/_index.scss
#	stylesheets/_settings.scss 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								cd79d5aca5 
								
							
								 
							
						 
						
							
							
								
								Fixed and simplified some logic for the handling of loki address messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a40a3d164f 
								
							
								 
							
						 
						
							
							
								
								Lots of logic for establishing a p2p connection, managing when the other user is online vs offline etc. Will always try to use P2P messaging when it can and fall back to storage server otherwise  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								efe95a70bc 
								
							
								 
							
						 
						
							
							
								
								Fix review issues.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3c07d99a89 
								
							
								 
							
						 
						
							
							
								
								Fix variable names.  
							
							... 
							
							
							
							Fix module export to be more consistent. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2bae6b5eed 
								
							
								 
							
						 
						
							
							
								
								Removed online broadcast message type, changed ttl logic a little, add p2p address and port to the window object when recieve message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								07076c27ae 
								
							
								 
							
						 
						
							
							
								
								Moved friend status to window, added start of p2p api stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b417edfc9b 
								
							
								 
							
						 
						
							
							
								
								Added new protos for online broadcast messages, added db hits for getting friends, local server now instantiated on the window, now sending online broadcast messages when the local server starts  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								813924685e 
								
							
								 
							
						 
						
							
							
								
								Link Previews  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								91ef39e482 
								
							
								 
							
						 
						
							
							
								
								Ensure that blocked messages are dropped even after sealed sender  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dcfc97713b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #150  from sachaaaaa/display_nickname_on_friend_accept  
							
							... 
							
							
							
							Send profile along with friend request accept message 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fe63a9af8c 
								
							
								 
							
						 
						
							
							
								
								always remove message from cache and return early when message.body is null  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c853239a00 
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #152  from sachaaaaa/fix_friendrequest_notification_when_sessionreset  
							
							... 
							
							
							
							Suppress friend request notification for session reset 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b226feaac7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #148  from Mikunj/signal-1.20  
							
							... 
							
							
							
							Signal 1.20 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								adfb4ab371 
								
							
								 
							
						 
						
							
							
								
								work with session reset  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b080828065 
								
							
								 
							
						 
						
							
							
								
								Fix bug where a friend request notification is shown when a session reset is received  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1238cbc4e6 
								
							
								 
							
						 
						
							
							
								
								Send profile along with friend request accept message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1a15ec9c15 
								
							
								 
							
						 
						
							
							
								
								Merge commit signal/master into signal-1.20  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9b71e8119e 
								
							
								 
							
						 
						
							
							
								
								Added error catching.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f21d1f65e6 
								
							
								 
							
						 
						
							
							
								
								Let OS select random open port.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8c9b1a7a7a 
								
							
								 
							
						 
						
							
							
								
								Added loki server.  
							
							... 
							
							
							
							Added test. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e08a63d078 
								
							
								 
							
						 
						
							
							
								
								Merge development into lint  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7b1799c418 
								
							
								 
							
						 
						
							
							
								
								Big ol' hunk o' chunk. Now using random.snode to populate swarm lists, now making multiple requests from said lists and they are processed as they complete rather than waiting for all to resolve  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6bd2d3962e 
								
							
								 
							
						 
						
							
							
								
								Linted files  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aab2a57b48 
								
							
								 
							
						 
						
							
							
								
								Some style and interaction fine-tuning  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								43e5d16020 
								
							
								 
							
						 
						
							
							
								
								Support for web socket communication with no signaling key  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								070d18b514 
								
							
								 
							
						 
						
							
							
								
								Updated function calls.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								654b0dac84 
								
							
								 
							
						 
						
							
							
								
								Merge signal-master.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6113f13d3a 
								
							
								 
							
						 
						
							
							
								
								Rip the worker logic out of message_receiver and add the functionality for it to work with pow. Fix pow tests to work with those changes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								05c18d42db 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #66  from sachaaaaa/session_reset  
							
							... 
							
							
							
							Handle session reset, Loki style 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1e3886cca8 
								
							
								 
							
						 
						
							
							
								
								More consistent naming of key storage functions, moved some loki messenger only functions into new file  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								91f018da57 
								
							
								 
							
						 
						
							
							
								
								remove unused var  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f2e1b9b8de 
								
							
								 
							
						 
						
							
							
								
								more missing awaits  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								933d7730db 
								
							
								 
							
						 
						
							
							
								
								Remove superfluous commented out line  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e612700f7 
								
							
								 
							
						 
						
							
							
								
								Handle session reset, Loki style  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2de01d0343 
								
							
								 
							
						 
						
							
							
								
								Back to multiple pending states, fix some notification bugs and friend requests should now work for all cases besides message sending interruption  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								822ea9ae53 
								
							
								 
							
						 
						
							
							
								
								Improve sealed sender icon display logic  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f900fc496d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #61  from Mikunj/feature/profile-nickname  
							
							... 
							
							
							
							Added profile sharing and setting nicknames. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								18d638fdbf 
								
							
								 
							
						 
						
							
							
								
								Fix sending and receiving profile.  
							
							... 
							
							
							
							Don't delete profile after if we set the display name to empty. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fa63ce5ade 
								
							
								 
							
						 
						
							
							
								
								Review changes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								35c89ea4d9 
								
							
								 
							
						 
						
							
							
								
								Big refactor, prekeybundle moved back to a content message  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								14ee7fec65 
								
							
								 
							
						 
						
							
							
								
								Moved and nicknames into conversations.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								aa57693fce 
								
							
								 
							
						 
						
							
							
								
								Update profile if we get it through a message.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7c92eeac30 
								
							
								 
							
						 
						
							
							
								
								Fixing cache clearing bug  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								79a861a870 
								
							
								 
							
						 
						
							
							
								
								Typing Indicators  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								99252702e1 
								
							
								 
							
						 
						
							
							
								
								Support receiving multiple images in one messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b515fc41e7 
								
							
								 
							
						 
						
							
							
								
								Removed some repetetive logs, made the polling time a variable and lower the polling time and PoW difficulty if we are in debug mode  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b65d6a6d2c 
								
							
								 
							
						 
						
							
							
								
								Refactor friend request status to use a state enum variable  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9fd822a7e3 
								
							
								 
							
						 
						
							
							
								
								Remove preKeys on friend request decline.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0dabce9e28 
								
							
								 
							
						 
						
							
							
								
								Remove preKeyBundle from message.  
							
							... 
							
							
							
							Always save preKeyBundles if we receive them.
Always override preKeys when saving. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								149da3374a 
								
							
								 
							
						 
						
							
							
								
								Fix pkb not being saved on the first cipher message.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0404f42738 
								
							
								 
							
						 
						
							
							
								
								Merge commit 'dbdd52b4eb11ca71adcae547c931b5cfda1ada11' into fix/pkb-type  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dbdd52b4eb 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #50  from Mikunj/fix/friend-request  
							
							... 
							
							
							
							Friend request fixes 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								05f8a1c43a 
								
							
								 
							
						 
						
							
							
								
								Handle pkb friend request accept.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4bb93e6e3c 
								
							
								 
							
						 
						
							
							
								
								rename sendEmptyMessageWithPreKeys to sendFriendRequestAccepted.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f29a515fdf 
								
							
								 
							
						 
						
							
							
								
								Fix up typos.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								8a0b8e1f00 
								
							
								 
							
						 
						
							
							
								
								Store the state of the friend request inside the conversation.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								db1145c0ce 
								
							
								 
							
						 
						
							
							
								
								Fix handling empty content.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ccb5ff79d4 
								
							
								 
							
						 
						
							
							
								
								Use correct log level in development mode and use log.debug() for some of the reoccurring logs  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								dba6a36e83 
								
							
								 
							
						 
						
							
							
								
								removed old unused code.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								75219966a7 
								
							
								 
							
						 
						
							
							
								
								Fixed preKeyBundle decryption.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								110387508f 
								
							
								 
							
						 
						
							
							
								
								UI fixes.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4ebdfab633 
								
							
								 
							
						 
						
							
							
								
								Update handling of new message logic.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6c5c95d956 
								
							
								 
							
						 
						
							
							
								
								Added  preKey decryption.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ff3cc7a315 
								
							
								 
							
						 
						
							
							
								
								Review changes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								489ec8fc65 
								
							
								 
							
						 
						
							
							
								
								Heap of linting, eslint warning/error removal, and fixed a couple small bugs found along the way  
							
							... 
							
							
							
							Created new table to store the received message hashes. Checking this table when receiving messages to look for duplicates. Should be cleared of expired messages on app start and every hour after
Removed id which was not needed for seen messages. Refactored filter logic into function and found function name error
create unique index for contact prekeys (to allow using REPLACE)
Fixed lint stuff that merge brought back 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								78d39ac177 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #41  from Mikunj/fix/friend-notification  
							
							... 
							
							
							
							Friend Notifications 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								17e5c861a1 
								
							
								 
							
						 
						
							
							
								
								Fixed review issues.  
							
							... 
							
							
							
							Fixed lint error. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								847401e49a 
								
							
								 
							
						 
						
							
							
								
								restore ciphertext padding  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9f101d9381 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #40  from Mikunj/merge/signal  
							
							... 
							
							
							
							Merge Signal 1.18.0 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								745d0e82d4 
								
							
								 
							
						 
						
							
							
								
								Added unread count badge .  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5a428af873 
								
							
								 
							
						 
						
							
							
								
								Restore incoming Signal decryption to fix 'Illegal wire type for field Message.Field .signalservice.Content.preKeyBundleMessage'  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4d3fb17e61 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'sig-development' into merge/signal  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6c6b0a4b92 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #37  from sachaaaaa/fix_network_status_warning  
							
							... 
							
							
							
							Make network status warning work with HTTP polling 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5bcf63e592 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #39  from BeaudanBrown/last-hash  
							
							... 
							
							
							
							Last hash 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9731c9e086 
								
							
								 
							
						 
						
							
							
								
								Comment out some signal server based code causing errors. Return before trying to unpad message because they aren't being padded in the first place  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								245ae721c7 
								
							
								 
							
						 
						
							
							
								
								Fix checking for when a friend request was accepted.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3389b1d457 
								
							
								 
							
						 
						
							
							
								
								Fixed the way preKeyBundle is stored in message.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								688f275262 
								
							
								 
							
						 
						
							
							
								
								pass in source, sourceDevice, timestamp and receivedAt when adding a friend request.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7e9016f510 
								
							
								 
							
						 
						
							
							
								
								Make network status warning work with HTTP polling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								bd0ce981dd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #34  from sachaaaaa/classify  
							
							... 
							
							
							
							ES2015 classes for LokiServer and FallBackSessionCipher 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								ad1cf94526 
								
							
								 
							
						 
						
							
							
								
								ES2015 classes for LokiServer and FallBackSessionCipher  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f4b60c3ff6 
								
							
								 
							
						 
						
							
							
								
								Fix setting friend requests incorrectly.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6aab900da2 
								
							
								 
							
						 
						
							
							
								
								Handle friend request updated.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								757216fe80 
								
							
								 
							
						 
						
							
							
								
								Fix text input disabling.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								fc3cb9c46d 
								
							
								 
							
						 
						
							
							
								
								Replace old pending messages with new one when adding a new incoming friend request.  
							
							... 
							
							
							
							More refactoring. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								d5fafd4d78 
								
							
								 
							
						 
						
							
							
								
								refactor friend request message props  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a80d6bb868 
								
							
								 
							
						 
						
							
							
								
								Merged branch correctly.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9ceb3c8ac0 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'development' into message-polling  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c5f9fae444 
								
							
								 
							
						 
						
							
							
								
								A few small bugfixes  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c59b196487 
								
							
								 
							
						 
						
							
							
								
								Now reading messages and adding them to conversations. Some cleaning of unreachable code. Modified the message data to be encoded as base64 string before sending to server  
							
							... 
							
							
							
							Sending our public key in header of message
Now attaching our key to the source field when sending messages, allows messages to be decrypted with the fallback cypher
Now polling the server for messages every 5 seconds
Sending the source device with messages
Added mock respond function to request to leave it that same as the websocket stuff. RetrieveMessages now just returns the result
Polling now continues if the server responds with an error. Returning only the result from sendMessage and retrieveMessages
Revert commenting of unreachable code
Refactored http logic into own file
Revert a change to websocket-resources 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0cf616328e 
								
							
								 
							
						 
						
							
							
								
								Fixed saving prekey bundle once friend request is accepted.  
							
							... 
							
							
							
							Added option to delete conversation after it is declined. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c150cbe34f 
								
							
								 
							
						 
						
							
							
								
								Friend request message indicator.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								b9e85bb141 
								
							
								 
							
						 
						
							
							
								
								Added handling of accept and decline events.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f589fdac5c 
								
							
								 
							
						 
						
							
							
								
								Merge signal changes into branch.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1ccf3b6b95 
								
							
								 
							
						 
						
							
							
								
								Added function to loki_message_api to do a single request call to storage server. Currently just gets called once when the application starts  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4b9fcb98d4 
								
							
								 
							
						 
						
							
							
								
								Linting and other housekeeping stuff  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								666cb1d3cb 
								
							
								 
							
						 
						
							
							
								
								replace double with triple equals  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a7d78c0e9b 
								
							
								 
							
						 
						
							
							
								
								Sealed Sender support  
							
							... 
							
							
							
							https://signal.org/blog/sealed-sender/  
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3481c0e58f 
								
							
								 
							
						 
						
							
							
								
								send back an empty message with prekeys upon accepting a friend request  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e1ffe582c3 
								
							
								 
							
						 
						
							
							
								
								Prompt user when an incoming friend request is received  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1cf8710127 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #16  from sachaaaaa/friend_response  
							
							... 
							
							
							
							Handle prekeys in incoming friend request 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9370e2b74a 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/signalapp/Signal-Desktop  into development  
							
							... 
							
							
							
							* 'master' of https://github.com/signalapp/Signal-Desktop : (38 commits)
  v1.17.0
  v1.17.0-beta.4
  Ensure that blue group avatars are preserved in dark theme
  Android theme: Incoming quotes take color from containing message
  Conversations have blue avatar backgrounds if no image provided
  Fix lint errors
  Add ca language
  inboxView: Ensure Conversation exists for our own number
  Ensure that file is not attached if we've filtered it
  v1.17.0-beta.3
  Localization updates
  v1.16.3
  Lint fixes
  Lint fixes
  Better handle large numbers of messages in cache on startup
  Keep object stores after conversations migrate to SQLCipher
  Longer timeout for orphaned file cleanup
  Tests and increase consistency for isFileDangerous calls
  Longer timeout for orphaned file cleanup
  v1.17.0-beta.2
  ...
# Conflicts:
#	background.html
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								93f1534512 
								
							
								 
							
						 
						
							
							
								
								Save prekeys upon reception of friend request. Add function to send an empty message as friend request acceptance  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								76e72f871a 
								
							
								 
							
						 
						
							
							
								
								Better handle large numbers of messages in cache on startup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0283c6428f 
								
							
								 
							
						 
						
							
							
								
								Ignore friend request messages that could not be decrypted  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								04b45f6aa1 
								
							
								 
							
						 
						
							
							
								
								Decrypt friend-request messages (the ones using fallback encryption). Moved logic into a new file libloki-protocol.js and concat loki code into js/libloki.js  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								42e941531f 
								
							
								 
							
						 
						
							
							
								
								Add fallback encryption (FallBackSessionCipher. simple DH) for when key bundle hasn't been received yet. Skip padding of bytes.  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								e81e253ccf 
								
							
								 
							
						 
						
							
							
								
								temporarily disable decryption and unpadding of incoming messages  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								6b998d79a7 
								
							
								 
							
						 
						
							
							
								
								Fix message_receiver not able to convert ArrayBuffer to stringBase64 in addToCache  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								2cfbfe477a 
								
							
								 
							
						 
						
							
							
								
								Better handle large numbers of messages in cache on startup  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								33ad509fbf 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/signalapp/Signal-Desktop  into development  
							
							... 
							
							
							
							# Conflicts:
#	_locales/ar/messages.json
#	_locales/es_419/messages.json
#	_locales/he/messages.json
#	_locales/hi/messages.json
#	_locales/hr/messages.json
#	_locales/kn/messages.json
#	_locales/ko/messages.json
#	_locales/mk/messages.json
#	_locales/sr/messages.json
#	_locales/uk/messages.json
#	_locales/vi/messages.json
#	package.json 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								814b9cf26a 
								
							
								 
							
						 
						
							
							
								
								Only accept 'you left group' messages when group blocked  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								c2e0ec5636 
								
							
								 
							
						 
						
							
							
								
								Group Blocking: Allow group metadata messages from own devices  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								9c399624cc 
								
							
								 
							
						 
						
							
							
								
								Support for blocking groups on mobile, via group/blocked syncs  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								536908b1c4 
								
							
								 
							
						 
						
							
							
								
								Temporarily prevent re-connecting when socket is disconnected  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								4f3b036fee 
								
							
								 
							
						 
						
							
							
								
								Skip decrypting messages coming from websocket (no client-server encryption)  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								02fbea96c0 
								
							
								 
							
						 
						
							
							
								
								Move base64 conversions off of the main thread  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								911bc63c67 
								
							
								 
							
						 
						
							
							
								
								Move all arrayBuffer<->base64 functions to be async  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								15751f3521 
								
							
								 
							
						 
						
							
							
								
								MessageReceiver.queueAllCached: Give event loop a rest  
							
							... 
							
							
							
							We don't want to queue multiple hundreds of messages at once, so we
let the event loop catch up every 20 messages queued. 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								0eb2c958a5 
								
							
								 
							
						 
						
							
							
								
								Handle contact: don't exit early if timer is 'invalid'  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								7983300f4a 
								
							
								 
							
						 
						
							
							
								
								Use base64 strings for incoming message cache instead of binary  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								85ab4e567f 
								
							
								 
							
						 
						
							
							
								
								Let server know that we failed to process message on cache error  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								52ee6abf52 
								
							
								 
							
						 
						
							
							
								
								Provide needed function to migration process  
							
							... 
							
							
							
							And disable attachment cleanup for now 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								44dec45995 
								
							
								 
							
						 
						
							
							
								
								Ensure that all messages in cache are migrated properly  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								59f955ff30 
								
							
								 
							
						 
						
							
							
								
								On error handling cached message, show error then delete  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								baf419b7b6 
								
							
								 
							
						 
						
							
							
								
								Ensure that we always enqueue in the same order received  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								3105b77475 
								
							
								 
							
						 
						
							
							
								
								Migrate to SQLCipher for messages/cache  
							
							... 
							
							
							
							Quite a few other fixes, including:
  - Sending to contact with no avatar yet (not synced from mobile)
  - Left pane doesn't update quickly or at all on new message
  - Left pane doesn't show sent or error status
Also:
 - Contributing.md: Ensure set of linux dev dependencies is complete 
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								5933a34a18 
								
							
								 
							
						 
						
							
							
								
								Use window.log in browser context, turn on console eslint rule  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f5852bb357 
								
							
								 
							
						 
						
							
							
								
								Be resilient to null thrown errors so we can surface to user  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								a40a39314a 
								
							
								 
							
						 
						
							
							
								
								Disable notifications on new 'reconnect' event for laptop resume  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								1c23c6a9d7 
								
							
								 
							
						 
						
							
							
								
								Remove window.config in favor of window.getXXX() accessors  
							
							
							
						 
						
							7 years ago  
				
					
						
							
							
								 
						
							
							
								f3bd0cf903 
								
							
								 
							
						 
						
							
							
								
								Refactor api.js into web_api, which encapsulates all web access  
							
							
							
						 
						
							8 years ago