cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,974 Commits 1 Branch 0 Tags
c6f1f505bbed01ac91f614fc8fbd6d0a68ba267e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser c6f1f505bb linked: ditch create dns fragment (for now) 2015-09-10 12:17:25 +02:00
Vincent Breitmoser 8a1a62692b linked: deprecate unused method, for now 2015-09-10 12:12:35 +02:00
Vincent Breitmoser ceefa96076 linked: move github client id and secret into build vars 2015-09-10 12:10:24 +02:00
Vincent Breitmoser 36f7ef2808 enable incremental and jumboMode for dexing, speeds up process considerably 2015-09-10 11:47:28 +02:00
Vincent Breitmoser 178aea6b90 linked: localization for github creation 2015-09-10 11:46:31 +02:00
Vincent Breitmoser 9fd5e966f6 linked: don't need javascript, so we don't enable it 2015-09-10 02:23:49 +02:00
Vincent Breitmoser 0f4af7d2ed linked: fix screwups from last commit, sigh 2015-09-10 02:11:43 +02:00
Vincent Breitmoser 7fa1afe430 linked: work on github lid creation error handling 2015-09-10 01:45:59 +02:00
Vincent Breitmoser cf7035ccbe linked: fix auth token revocation (maybe?) 2015-09-08 15:55:21 +02:00
Vincent Breitmoser c07e029345 linked: add "retry" 2015-09-08 15:55:17 +02:00
Vincent Breitmoser 0ef929fb7f linked: move between fixed states 2015-09-08 15:53:05 +02:00
Vincent Breitmoser 0db1495ea1 statusindicator: method to set states by name 2015-09-08 15:51:27 +02:00
Vincent Breitmoser bb7efe0ce9 linked: fix button margins in select dialog 2015-09-08 15:51:01 +02:00
Vincent Breitmoser a5eea6c200 linked: move client id and secret into static vars (build vars later) 2015-09-08 14:46:18 +02:00
Vincent Breitmoser 79f6ade240 fix unit test for linked ids 2015-09-06 01:29:39 +02:00
Vincent Breitmoser d2ce770c1a Merge branch 'master' of github.com:open-keychain/open-keychain 2015-09-06 00:59:12 +02:00
Vincent Breitmoser 8e60bf70a1 linked: clear cookies and don't save form data in oauth webview 2015-09-06 00:59:06 +02:00
Vincent Breitmoser 31cfbdc5d2 linked: fix "navigate up" in LinkedIdWizard (imperfect) 2015-09-06 00:58:13 +02:00
Vincent Breitmoser 60e9141b86 linked: basic shared element transition 2015-09-06 00:49:19 +02:00
Vincent Breitmoser 2cda486427 linked: use webview instead of app, and some minor layoutings 2015-09-02 04:14:45 +02:00
Vincent Breitmoser 87f7fe65a8 linked: fix back button in github dialog 2015-09-01 14:11:04 +02:00
Vincent Breitmoser 19c9fcc2c9 linked: order selection dialog alphabetically 2015-09-01 14:07:04 +02:00
Vincent Breitmoser 676b393542 statusindicator: don't redisplay child with animation if already shown 2015-09-01 13:59:17 +02:00
Vincent Breitmoser 1b3f70073a linked: smooth over progress with tactical pauses 2015-09-01 13:58:52 +02:00
Vincent Breitmoser 6225c940f9 linked: redesign github resource creation, implement ouath flow 2015-09-01 13:58:04 +02:00
Vincent Breitmoser 47ef8cbe55 fix missing date in CryptoInputParcel in some cases (could be a bigger problem!) 2015-09-01 13:48:49 +02:00
Vincent Breitmoser 2aa424dd4d linked: use link icon from octo set? not sure yet.. 2015-09-01 07:46:37 +02:00
Vincent Breitmoser 66b9c167d6 linked: update icon design of github l-id creation 2015-09-01 07:37:49 +02:00
Vincent Breitmoser 3e55fca0e5 linked: work on github design 2015-09-01 07:09:53 +02:00
Vincent Breitmoser b52a0303ca linked: redesign github resource creation, implement ouath flow (WIP) 2015-09-01 06:42:10 +02:00
Vincent Breitmoser 9668abfe9e add simple StatusIndicator widget 2015-09-01 06:40:28 +02:00
Vincent Breitmoser 261c83043b linked: Github -> GitHub (fixes #1513) 2015-08-31 14:24:13 +02:00
Vincent Breitmoser 36f8e9f563 linked: fix small typo 2015-08-31 13:48:40 +02:00
Vincent Breitmoser ee81018163 linked: disable DNS resource (for now) 2015-08-31 13:47:00 +02:00
Vincent Breitmoser c1cc27366c move stray test file to correct position 2015-08-29 13:36:35 +02:00
Vincent Breitmoser e037b78248 Merge remote-tracking branch 'origin/master' 2015-08-29 13:29:51 +02:00
Vincent Breitmoser a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
Merge Linked Identities.

Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
	OpenKeychain/src/main/res/anim/fade_in.xml
	OpenKeychain/src/main/res/anim/fade_out.xml
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
	OpenKeychain/src/main/res/menu/key_view.xml
	OpenKeychain/src/main/res/values/strings.xml
	OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	README.md
 2015-08-29 13:28:56 +02:00
Vincent Breitmoser 79a519aba9 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-27 23:58:01 +02:00
Vincent Breitmoser 5acdef6551 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-27 16:34:17 +02:00
Vincent Breitmoser e7991e8dc8 use nicer filenames during export 2015-08-27 16:34:08 +02:00
Vincent Breitmoser 9e3c041549 some cleanup in FileHelper, and allow input of filename during export 2015-08-27 16:13:32 +02:00
Vincent Breitmoser e3d1f68e79 trigger indexing of file after operation (#1498) 2015-08-22 12:54:19 +02:00
Vincent Breitmoser 16903357e1 mention filename to export to in log 2015-08-22 12:22:43 +02:00
Vincent Breitmoser b082fe403d Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-17 12:39:13 +02:00
Vincent Breitmoser 3c8028fc88 apply fixPgpMessage to plaintext/armored decrypt input 2015-08-17 12:38:46 +02:00
Vincent Breitmoser 7004d129a8 display dummy key for empty result, don't display during search 2015-08-14 15:00:19 +02:00
Vincent Breitmoser b2d447ab32 show dummy item if there are no secret keys 2015-08-14 14:47:20 +02:00
Vincent Breitmoser 94683607d6 always show MainActivity after first-time CreateKeyActivity 2015-08-14 12:55:52 +02:00
Vincent Breitmoser d6c51603c2 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-08-12 16:21:08 +02:00
Vincent Breitmoser 3a5ea0f135 show result error in cachingcryptooperationfragment (related #1445) 2015-08-12 16:20:52 +02:00
Vincent Breitmoser dc81e0254c use snackbar from repository (again), and update to 2.11.0 
This release merged our pull requests for round corners on tablet for top line,
and nicer dismiss-on-swipe animation.

https://github.com/nispok/snackbar/pull/134
https://github.com/nispok/snackbar/pull/135
 2015-08-07 12:07:39 +02:00
Vincent Breitmoser e4b113701c Merge remote-tracking branch 'origin/master' 2015-07-15 21:14:53 +02:00
Vincent Breitmoser 4cef97be5f update safeslinger lib (closes #1434) 2015-07-15 00:47:41 +02:00
Vincent Breitmoser 2ceec6ff68 fix verification of android support lib (broken in b59be903) 2015-07-14 19:21:25 +02:00
Vincent Breitmoser d0c389775a Merge remote-tracking branch 'origin/master' 2015-07-14 16:49:12 +02:00
Vincent Breitmoser 49f3b3780d update snackbar with new animation flow 2015-07-14 16:49:06 +02:00
Vincent Breitmoser b59be903c3 Revert "Use snackbar lib from maven repo" 
This reverts commit bfc57aefa5.

Conflicts:
	OpenKeychain/build.gradle
	settings.gradle
 2015-07-14 14:37:29 +02:00
Vincent Breitmoser 96dbb9e60c add pseudo-static id property to CryptoOperationHelper 2015-07-09 11:51:38 +02:00
Vincent Breitmoser 3b189fbe31 run queued operations in onViewStateRestored, *after* onActivityCreated 2015-07-09 02:35:54 +02:00
Vincent Breitmoser 7f9cc445fb cryptoophelper: requested code must be saved between instances! 2015-07-09 02:35:22 +02:00
Vincent Breitmoser a549938b61 multi-decrypt: save currentInputUri state 2015-07-09 02:34:03 +02:00
Vincent Breitmoser 35b9dabcb8 backup: only ask for passphrase for secret keys which have one 2015-07-09 02:33:16 +02:00
Vincent Breitmoser 3c239bfb34 use onResumeFragments instead of onResume for fragment initialization 2015-07-09 01:14:12 +02:00
Vincent Breitmoser 20cebc2788 change wording of export dialog, remove "export secret" checkbox 2015-07-08 17:25:07 +02:00
Vincent Breitmoser e0cb891a1f Merge remote-tracking branch 'origin/master' 2015-07-08 15:24:30 +02:00
Vincent Breitmoser 6565adc5cc keylist: show delete as icon in multi-select 2015-07-08 15:24:10 +02:00
Vincent Breitmoser 74a4effcd8 hide keyboard before operations, too 2015-07-08 15:23:55 +02:00
Vincent Breitmoser a74d86c3d8 grey out text color of key creation date for disabled items 2015-07-08 15:14:38 +02:00
Vincent Breitmoser e51d443154 change title on backstack change in MainActivity 2015-07-08 15:13:58 +02:00
Vincent Breitmoser d7a7c7310a hide keyboard on crypto error/success 2015-07-08 15:13:44 +02:00
Vincent Breitmoser eab46df9a3 cleanup KeyListFragment, remove export all keys 2015-07-08 14:53:46 +02:00
Vincent Breitmoser 9eee9acba2 multi-decrypt: add retry mechanism 2015-07-08 05:15:52 +02:00
Vincent Breitmoser bf2dc8edc3 multi-decrypt: add cancelled state 2015-07-08 04:53:43 +02:00
Vincent Breitmoser 5633fcc92f fix symmetric passphrase caching (fixes #1401) 2015-07-08 04:36:43 +02:00
Vincent Breitmoser 6cbc0ceeae comment for database fix 2015-07-08 03:52:38 +02:00
Vincent Breitmoser 70d94acc58 put encryptdecrypt overview into a scrollview 2015-07-08 03:52:38 +02:00
Vincent Breitmoser af546ae101 apply database fix for bogus rows introduced by issue #1402 2015-07-08 02:55:35 +02:00
Vincent Breitmoser dad2ba0db8 fix expiry check in edit key ui 2015-07-08 02:34:03 +02:00
Vincent Breitmoser c01c71ba68 no progress dialog for bind action in view key / yubikey fragment 2015-07-08 02:30:06 +02:00
Vincent Breitmoser 3af97bf0e6 some cleanup and fix for back button in ImportKeysActivity (fixes #1372) 2015-07-08 02:29:04 +02:00
Vincent Breitmoser 510999c3a2 fix result type for divert-to-card new subkey error 2015-07-08 02:28:05 +02:00
Vincent Breitmoser d9b07625e8 addition of subkeys for divert-to-card primary keys is not supported 2015-07-08 01:42:47 +02:00
Vincent Breitmoser 642f83c1f4 better handling of divert-to-card keys for subkey modifications 2015-07-08 01:41:55 +02:00
Vincent Breitmoser ac2c8f994e (missed a couple files in last commit) 2015-07-08 00:01:39 +02:00
Vincent Breitmoser 587e7d088b use QueueingCryptoOperationFragment in all other places 2015-07-07 23:57:12 +02:00
Vincent Breitmoser 310228f6ba introduce QueueingCryptoOperationFragment to queue result handling in detached state 2015-07-07 23:43:23 +02:00
Vincent Breitmoser 895d1fbef6 try cache in certify operation (fixes #1242) 2015-07-07 23:41:44 +02:00
Vincent Breitmoser 65362beaf9 move queued action handling from prev commit into onActivityCreated 2015-07-07 22:23:08 +02:00
Vincent Breitmoser c8107bd4ed handle getActivity() by queueing results in CreateKeyFinalFragment 2015-07-07 21:52:17 +02:00
Vincent Breitmoser a91fc1c0c9 fix passphrase->deletion ui flow for secret keys, and disregard cache 2015-07-07 19:55:27 +02:00
Vincent Breitmoser b1f5290dfa fix some nullpointers from proxy implementation 2015-07-07 17:45:27 +02:00
Vincent Breitmoser 64cec07b16 fix handling of progress dialog creation in CryptoOperationFragment (fixes #1407) 2015-07-07 17:16:12 +02:00
Vincent Breitmoser a320affe86 tests: make sure encryption happens to all enc-capable subkeys 2015-07-07 17:16:11 +02:00
Vincent Breitmoser 148867ae86 actually disable non-enabled items in keyspinner (in keyadapter) (fixes #1366) 2015-07-06 17:19:08 +02:00
Vincent Breitmoser e9e9cf2374 also catch DecoderException in decryptverify 2015-07-06 16:37:47 +02:00
Vincent Breitmoser 8b439be1f5 don't cache exporthelper, keep type for KeyItem in KeySpinner 2015-07-06 16:24:26 +02:00
Vincent Breitmoser 7648602fc8 encrypt to all encryption subkeys, rather than just the first 2015-07-06 02:18:34 +02:00
Vincent Breitmoser f1a75a81e7 catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown from BouncyCastle 2015-07-06 02:02:52 +02:00
Vincent Breitmoser 922d4c6a96 fix PromoteKeyOperationTest 2015-07-06 01:20:55 +02:00
Vincent Breitmoser e70d06603a forgot a couple lines to commit 2015-07-06 00:59:28 +02:00