Commit Graph

  • 5c3b30104a Merge branch 'mkirk/moving-repo' master Michael Kirk 2017-07-21 15:53:34 -0400
  • 1499840de5 update README and podspec to direct upgrading users to proper source mkirk/moving-repo Michael Kirk 2017-07-21 14:28:52 -0400
  • 8f2a48ec99 Instrument errors in message manager. charlesmchen/analytics3 Matthew Chen 2017-07-21 14:39:41 -0400
  • d857730601 Update analytics macros. Matthew Chen 2017-07-21 11:50:19 -0400
  • d98c07ecff Merge branch 'charlesmchen/countryNameVsiOS8' Matthew Chen 2017-07-20 09:14:49 -0400
  • 493aaca242 Avoid nil country names on iOS 8. Matthew Chen 2017-07-19 14:21:54 -0400
  • e20d63240b Merge branch 'mkirk/cleanup-with-transaction' Matthew Chen 2017-07-14 09:26:35 -0400
  • faeb7100b9 use existing transaction in cleanup Michael Kirk 2017-07-13 09:57:10 -0400
  • fe0f01daec Merge branch 'charlesmchen/pasteVoiceMessages' Matthew Chen 2017-07-13 17:22:18 -0400
  • c255504959 Fix copy and paste of voice messages. Matthew Chen 2017-07-13 14:31:12 -0400
  • 640ec13b2e Merge branch 'charlesmchen/orphanCleanup' Matthew Chen 2017-07-12 12:13:14 -0400
  • 6fa3fac4ae Fix broken tests. Matthew Chen 2017-07-07 11:00:52 -0400
  • 7a50d6b996 Fix broken tests. Matthew Chen 2017-07-07 10:26:09 -0400
  • 762f915179 Respond to CR. Matthew Chen 2017-07-06 13:30:20 -0400
  • 96da091e9b Run orphan cleanup on startup. Matthew Chen 2017-07-04 12:42:33 -0400
  • 9115a1f973 Merge branch 'mkirk/update-ci-gems' Michael Kirk 2017-07-12 11:36:38 -0400
  • 57b90e1462 update ci gems Michael Kirk 2017-07-11 13:25:32 -0400
  • e0f805f80f Merge branch 'mkirk/fix-persistence-upgrade' Michael Kirk 2017-07-11 15:26:11 -0400
  • 3fa84860ff update ci gems mkirk/update-ci-gems Michael Kirk 2017-07-11 13:25:32 -0400
  • ab6c1fb3b8 Fix persist view for upgrade scenarios mkirk/fix-persistence-upgrade Michael Kirk 2017-07-10 13:37:24 -0500
  • 9d3175b5cf Merge branch 'mkirk/cleanup-logging' Michael Kirk 2017-07-11 13:19:51 -0400
  • 957979585c remove unhelpful logging mkirk/cleanup-logging Michael Kirk 2017-07-10 11:52:22 -0500
  • 8361ffb818 Merge branch 'mkirk/persist-thread-view' Michael Kirk 2017-07-10 11:52:45 -0500
  • ea681a61e2 persist thread view Michael Kirk 2017-07-05 21:31:58 -0500
  • 49f0e315af Don’t sync verification state until app has finished becoming active. hotfix/2.13.4.0 Matthew Chen 2017-07-06 12:34:08 -0400
  • c1e1247eff Merge branch 'charlesmchen/identityManagerVsStartup' Matthew Chen 2017-07-06 14:38:52 -0400
  • 92276157dc Don’t sync verification state until app has finished becoming active. Matthew Chen 2017-07-06 12:34:08 -0400
  • 2216c2d413 Merge pull request #295 from WhisperSystems/mkirk/fix-tests Michael Kirk 2017-07-06 10:28:28 -0500
  • a23b4871e0 fix tests Michael Kirk 2017-07-06 09:36:49 -0500
  • 72e893d5f7 Merge commit 'e24f18320d3aefe87d2532c9f0520348c4598cb2' Michael Kirk 2017-07-06 09:08:02 -0500
  • aee1c460a3 persist thread view mkirk/persist-thread-view Michael Kirk 2017-07-05 21:31:58 -0500
  • b9fa48a7b0 BLURG charlesmchen/fakeMessages Matthew Chen 2017-07-05 19:51:06 -0400
  • e24f18320d Merge branch 'charlesmchen/modelConnection' into hotfix/2.13.3.0 hotfix/2.13.3.0 Matthew Chen 2017-07-05 19:06:30 -0400
  • 58fb86b8e0 Use a dedicated connection for model reads & writes. Matthew Chen 2017-07-05 18:54:48 -0400
  • 065017cafd Merge branch 'charlesmchen/sharedReadAndWriteConnections' into hotfix/2.13.3.0 Matthew Chen 2017-07-05 17:23:03 -0400
  • daae31d30e Modify TSStorageManager to use separate shared read and write connections. charlesmchen/crashOnLaunch Matthew Chen 2017-07-05 16:58:39 -0400
  • 8714a8f37c Merge branch 'mkirk/no-sync-to-unregistered-number' Michael Kirk 2017-07-05 13:00:35 -0500
  • deff1fa4e7 FIX: verifiying unregistered user prints "no longer registered" error on every launch Michael Kirk 2017-07-01 09:53:45 -0700
  • 1fc5f77286 Merge branch 'mkirk/declined-call-notification' Michael Kirk 2017-07-05 12:42:51 -0500
  • fd625dff50 remove default case for better compiler warnings Michael Kirk 2017-07-05 12:42:21 -0500
  • 89f86c4fd2 call type for declined call Michael Kirk 2017-07-03 13:45:17 -0500
  • 04ef06ce95 Merge branch 'mkirk/fix-unread-badge' Michael Kirk 2017-06-30 10:21:30 -1000
  • f59779c118 message manager updates badge count Michael Kirk 2017-06-30 06:12:37 -1000
  • 85fe68d3c4 Fix typo after rename Michael Kirk 2017-06-28 19:08:40 -1000
  • d6c5497f64 Merge branch 'mkirk/fix-tests' Michael Kirk 2017-06-28 18:40:37 -1000
  • 0b33ef6161 try fastlane scan, since build is timing out. Michael Kirk 2017-06-28 18:12:55 -1000
  • acf31db4b3 bump travis image to 8.3 Michael Kirk 2017-06-28 18:04:25 -1000
  • a8ea2428c6 gemfile for consistent build on dev/CI Michael Kirk 2017-06-28 17:39:35 -1000
  • 605db6b788 Fix up deleteAttachments method since making attachmentFolder dispatchOnce Michael Kirk 2017-06-28 17:06:45 -1000
  • 1d71ca5e50 Fix some more tests. Michael Kirk 2017-06-28 16:18:13 -1000
  • 8f9af85cca prefer hacks in test to hacks in code. Michael Kirk 2017-06-28 08:09:23 -1000
  • 1b9aae2ea6 CR: renaming var to be more general Michael Kirk 2017-06-28 07:32:31 -1000
  • e652dff4b4 Allow override of singleton enforcement in test app Michael Kirk 2017-06-03 18:40:55 -0700
  • edf5852e82 set-expiration dispatches *sync* so we can test it. Michael Kirk 2017-06-03 18:30:21 -0700
  • 1fb9fa79df Fix up some more tests. Michael Kirk 2017-06-03 18:29:41 -0700
  • 13c5bdb8c5 fix disappearing messages test Michael Kirk 2017-06-03 17:54:40 -0700
  • 2addb9e81d Fixed test build. Some tests still failing. Michael Kirk 2017-06-03 17:38:32 -0700
  • c711b4a66d Merge branch 'mkirk/key-version' Michael Kirk 2017-06-23 15:16:17 -0400
  • b2f9abbc7c transmit key version byte Michael Kirk 2017-06-23 15:12:39 -0400
  • 14c64239a3 Merge branch 'charlesmchen/archiveSessionsOnSSQ' Matthew Chen 2017-06-22 18:18:49 -0400
  • e9219743ff Archive sessions on the 'session store' queue. Matthew Chen 2017-06-22 18:14:21 -0400
  • 793a7449b0 Merge branch 'mkirk/archive-sessions-on-id-change' Michael Kirk 2017-06-22 17:24:05 -0400
  • 5da7dc1fd3 Archive sessions upon identity change. Michael Kirk 2017-06-22 17:07:01 -0400
  • 07e0291377 Merge branch 'charlesmchen/diskUsage' Matthew Chen 2017-06-22 17:17:00 -0400
  • e8e7b6bcba Add creation timestamp to attachment streams. Matthew Chen 2017-06-22 17:09:25 -0400
  • ce76425b0f Fix broken tests. charlesmchen/fixTests Matthew Chen 2017-06-22 17:07:07 -0400
  • 8fda18a8e3 Merge branch 'mkirk/verification-sync' Michael Kirk 2017-06-22 15:19:59 -0400
  • 5a2169fa78 Don't sync verification until NullMessage succeeds. This better mirrors existing sync message behavior mkirk/verification-sync Michael Kirk 2017-06-22 15:13:51 -0400
  • 4c22f371a9 better comment on strange padding Michael Kirk 2017-06-22 15:13:34 -0400
  • 6dea4c9fef fix padding calculation Michael Kirk 2017-06-22 14:32:06 -0400
  • a5660f4db4 cleanup ahead of PR Michael Kirk 2017-06-22 13:56:38 -0400
  • d927cba5ce don't sync verified state when we have never recorded the recipients identity Michael Kirk 2017-06-22 13:46:10 -0400
  • badaa54327 sync all verification states with contact sync Michael Kirk 2017-06-22 13:36:40 -0400
  • 12bfae10ed All sync messages should have 1-512 random padding Michael Kirk 2017-06-22 13:05:28 -0400
  • 35ee92f38f send null message when syncing verification state Michael Kirk 2017-06-22 12:12:24 -0400
  • 99cd8fc27d Log when receiving null message Michael Kirk 2017-06-21 21:05:21 -0400
  • f653bc36a8 sync verification state with contacts Michael Kirk 2017-06-21 21:04:16 -0400
  • 48b3f498a9 WIP: adapt to verification proto changes Michael Kirk 2017-06-21 20:19:23 -0400
  • f526a372c9 proto update Michael Kirk 2017-06-21 19:24:09 -0400
  • 6566ea694c no need to send sync messages when only 1 device Michael Kirk 2017-06-21 19:10:38 -0400
  • 8b04e2a880 Merge branch 'charlesmchen/logOverflow' Matthew Chen 2017-06-22 14:27:30 -0400
  • ed369436fb Reduce chattiness of logs; increase log file sizes. Matthew Chen 2017-06-22 13:24:53 -0400
  • b946badd97 [SSK] Reduce chattiness of logs; increase log file sizes. Matthew Chen 2017-06-22 10:10:30 -0400
  • 2737845c25 assert only sending sync messages when appropriate mkirk/only-sync-when-multidevice Michael Kirk 2017-06-21 21:06:09 -0400
  • 388f75ef04 no need to send sync messages when only 1 device Michael Kirk 2017-06-21 19:10:38 -0400
  • 4609c508ec Merge branch 'charlesmchen/fixCFail' Matthew Chen 2017-06-21 17:45:00 -0400
  • 30961cf2a5 Fix OWSCFail() macro. Matthew Chen 2017-06-21 16:17:19 -0400
  • 4eacfe768f Merge branch 'charlesmchen/verificationSyncVsUI' Matthew Chen 2017-06-21 17:43:20 -0400
  • d8b34f6302 Ensure verification UI is updated to reflect incoming verification state sync messages. Matthew Chen 2017-06-21 16:29:20 -0400
  • 2315ab79de Merge branch 'charlesmchen/attachmentStreamUpgradePerf' Matthew Chen 2017-06-21 10:35:33 -0400
  • e86e175ceb Respond to CR. Matthew Chen 2017-06-21 10:35:25 -0400
  • beb4ed71e7 Respond to CR. Matthew Chen 2017-06-21 09:58:19 -0400
  • cf65cc3be5 Improve perf of attachment stream file path upgrade. Matthew Chen 2017-06-20 17:39:33 -0400
  • ed249840c6 Merge branch 'charlesmchen/slowLaunchRelease' Matthew Chen 2017-06-20 13:17:32 -0400
  • 27e5c836b7 Refine observation of async registration completion. Matthew Chen 2017-06-20 12:04:59 -0400
  • 7af758bc67 Merge branch 'charlesmchen/enableVerificationStateSync' Matthew Chen 2017-06-19 19:47:25 -0400
  • 07bec72f61 Enable verification state sync. Matthew Chen 2017-06-19 19:46:28 -0400
  • 5110c5892d Merge branch 'mkirk/verification-key-length' Michael Kirk 2017-06-19 17:26:33 -0400
  • e746c6b7ec append/remove key type as necessary to fix verification syncing Michael Kirk 2017-06-19 11:05:06 -0400
  • 2059bb4966 Merge branch 'WhisperSystems-mkirk/fix-verification-crash' Michael Kirk 2017-06-19 15:33:55 -0400