Commit graph

847 commits

Author SHA1 Message Date
Mikunj
12ce0140de Left pane changes.
Merge commit 'b3ac1373fa64117fe2a9ccfddf3712f1826c06d9' into signal-1.23

# Conflicts:
#	_locales/en/messages.json
#	background.html
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/models/messages.js
#	js/views/conversation_list_item_view.js
#	js/views/conversation_list_view.js
#	js/views/conversation_search_view.js
#	js/views/inbox_view.js
#	libtextsecure/account_manager.js
#	package.json
#	stylesheets/_global.scss
#	stylesheets/_index.scss
#	stylesheets/_modules.scss
#	test/_test.js
#	test/index.html
#	test/models/conversations_test.js
#	test/views/conversation_search_view_test.js
#	ts/components/ConversationListItem.tsx
#	ts/components/MainHeader.tsx
#	ts/components/conversation/ConversationHeader.tsx
#	ts/components/conversation/ResetSessionNotification.tsx
2019-04-17 16:42:09 +10:00
Mikunj
48c4ed1a29 Partial Merge commit 'bf904ddd129ceba8fa363ccf6d10ecd256c65f63' into signal-1.23
# Conflicts:
#	_locales/en/messages.json
#	app/sql.js
#	js/background.js
#	js/conversation_controller.js
#	js/models/conversations.js
#	js/views/inbox_view.js
#	main.js
2019-04-17 13:47:17 +10:00
Mikunj
57195017f9 Linting 2019-04-17 12:05:30 +10:00
Mikunj
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
2019-04-17 11:59:54 +10:00
Beaudan
620380d2d9 Move filter messages to message api and some other cleaning 2019-04-15 15:27:14 +10:00
Beaudan
377e90bafe Include long polling header for retrieve messages, extend retrieveMessages timeout to 40 seconds, reduce default tmeout to 5 seconds, remove dev/prod poll time difference 2019-04-11 15:31:00 +10:00
Beaudan
db8f8ba36f Multiple all ttl values by 1000 and stop dividing timestamp by 1000 so they are both milliseconds 2019-04-11 10:56:17 +10:00
Beaudan
fa7042c043 Added wrong swarm error which gets thrown if we receive a 421 error, update the swarm lists if we get one of those errors 2019-04-08 13:37:20 +10:00
Beaudan
b09f2970fc Move NotFoundError to errors.js 2019-04-08 13:37:20 +10:00
Beaudan
531ee92dcb Updated messenger to work with slightly different storage server API and changed swarm requests to go through storage server 2019-04-08 13:37:20 +10:00
Beaudan Campbell-Brown
338f4e3682
Merge pull request #255 from BeaudanBrown/better-logs
Improve sending/retrieving/swarm logs
2019-03-25 17:30:41 +11:00
Beaudan
e5449f56ee Added success and failure callbacks when queueing envelope, now responding with 404 if we fail to decrypt a p2p message 2019-03-14 10:02:38 +11:00
Beaudan
6656a89092 Cleaned up a lot of the logs, stop them from printing more than once etc 2019-03-13 12:05:47 +11:00
Scott Nonnenberg
b3ac1373fa Move left pane entirely to React 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
0b0dfbce9d Don't return error for groups with no members but yourself 2019-03-12 17:44:14 -07:00
Scott Nonnenberg
e4f18f9daa libsignal-protocol: Protect against null thrown Errors 2019-03-12 17:44:14 -07:00
Beaudan
5a23dbb687 Review comments and add local server listener before starting 2019-03-01 13:49:59 +11:00
Beaudan
8c20a31dd4 Review suggestions 2019-03-01 12:50:45 +11:00
Beaudan
eaea7d9b7d Catch errors when starting local server and retry every 30 seconds 2019-03-01 12:45:31 +11:00
Mikunj
06be1da40d Added p2p message styling 2019-02-22 10:22:03 +11:00
Beaudan
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 2019-02-21 14:33:03 +11:00
Scott Nonnenberg
3fb6ab295f Debug log optimizations and improvements 2019-02-20 16:51:30 -08:00
Scott Nonnenberg
77ae717b9b Clean up shutdown handling - stop processing incoming messages 2019-02-20 16:51:30 -08:00
Scott Nonnenberg
af40ceda6c Note to Self timer fixes for bugs reported by beta users 2019-02-20 16:40:35 -08:00
Scott Nonnenberg
7c4ba5446c Throw error if incoming attachment has mismatched attachment size 2019-02-20 16:40:35 -08:00
Beaudan
dc67aaf9cc Roll back change to ping more often again, ping our offline contacts every 2 mins to check if they have come back online 2019-02-20 16:08:41 +11:00
Beaudan
29bca71d5a Try ping contacts that send us storage server messages in the last 2 mins 2019-02-20 16:08:41 +11:00
Beaudan
d6a210efaa Reworked the update p2p details to be more robust and stopped some redundant pings from happening 2019-02-20 16:08:41 +11:00
Beaudan
b00a0cb699 Rename isOnline to isPing for clarity, and reduce the ttl for online broadcast messages to 1 min 2019-02-20 16:08:41 +11:00
Beaudan
2fd746821a Added function for getting your loki IP and bind the local server 2019-02-14 13:09:04 +11:00
sachaaaaa
6febbf83da reset line endings in libsignal-protocol 2019-02-14 11:07:37 +11:00
Scott Nonnenberg
2c3847affe MessageReceiver: Don't wait for cache update to move forward 2019-02-13 16:04:58 -08:00
Scott Nonnenberg
291e8d80cb Fix asm.js errors in emscripten-generated functions 2019-02-13 16:04:58 -08:00
Scott Nonnenberg
5b54c9554e Remove groups table, conversation is single source of truth 2019-02-13 16:04:58 -08:00
Scott Nonnenberg
b69eea543c MessageReceiver: Don't wait for app logic to start next decrypt 2019-02-13 16:04:58 -08:00
Scott Nonnenberg
041fe4be05 Remove JSON column and Backbone Model for unprocessed 2019-02-13 16:04:58 -08:00
Scott Nonnenberg
1d2c3ae23c Download attachments in separate queue from message processing 2019-02-12 16:34:21 -08:00
Scott Nonnenberg
a43a78731a Note to Self 2019-02-12 16:08:51 -08:00
Scott Nonnenberg
021e807180 MessageReceiver: Log errors with proper message id 2019-02-11 18:32:05 -08:00
sachaaaaa
68fe552156 Merge commit '5c8558e293989094693f918a63b672301f1aeb55' into merge_1_21_1
* commit '5c8558e293989094693f918a63b672301f1aeb55':
  v1.21.1
  v1.21.1-beta.1
  Fix: Navigation to message via quote click didn't always work
  mainWindow.close - be ready for null mainWindow
  Ensure that Curve.async points to worker after startWorker call
  Protect against unhandled promises when calling checkForUpdates
  Reenable send when link preview is missing an image

# Conflicts:
#	package.json
2019-02-12 13:17:35 +11:00
sachaaaaa
1a810f4e4f
Merge pull request #186 from Mikunj/local-preview
Added local link previews
2019-02-11 16:21:41 +11:00
Scott Nonnenberg
2ce86af093 Ensure that Curve.async points to worker after startWorker call 2019-02-08 11:54:22 -08:00
sachaaaaa
fdc51e88dd only verify the prekey id when there is no current session active 2019-02-08 16:36:33 +11:00
Mikunj
a1e4b740f2 Fixed up settings view.
Fix review issues.
2019-02-08 16:03:15 +11:00
sachaaaaa
2755ff06d8 remove messages from cache before throwing if the prekey id could not be verified 2019-02-08 14:21:44 +11:00
Mikunj
ae695fe32f Remove sending attachments. 2019-02-08 13:36:22 +11:00
Scott Nonnenberg
b3eb0646c0 Reenable send when link preview is missing an image 2019-02-07 10:21:43 -08:00
sachaaaaa
7186f28019 Ensure a session is always initiated using the prekey assigned to the contact 2019-02-07 17:58:24 +11:00
sachaaaaa
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
2019-02-06 13:53:20 +11:00
Beaudan
0c104e5a53 Small fix for the disconnected banner coming up when it shouldn't, just default to thinking we are connected and mock the onEmpty event. Will only get set to not connected if requests fail 2019-02-05 10:48:51 +11:00