Commit Graph
5340 Commits
Author SHA1 Message Date
Dominik Schürmann 9887e8b42a Advanced screen: edited key saved 2015-12-28 15:38:16 +01:00
Dominik Schürmann 1dea4ef19f Pass trough masterKeyId and fingerprint to advanced key edit fragments 2015-12-27 15:45:08 +01:00
Dominik Schürmann 09410e7f69 Fix merge conflicts 2015-12-27 15:06:02 +01:00
Vincent BreitmoserandDominik Schürmann aca0cd340b inline-edit: move action mode menu handling int activity 2015-12-27 15:00:14 +01:00
Vincent BreitmoserandDominik Schürmann 69220cb4c0 inline subkey editing, fixed 2015-12-27 15:00:14 +01:00
Vincent BreitmoserandDominik Schürmann 00e97586b0 inline subkey editing (wip commit) 2015-12-27 15:00:14 +01:00
Vincent BreitmoserandDominik Schürmann fd119bda00 extend-uid: use FAB instead of extra list item 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann 54cc08c291 extended: leave ActionMode on page change 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann 312c245de1 extended-share: move qr code resizing into onLayoutChangeListener (+performance, -recreation crash) 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann 4ec51fcd9f extend-uid: button and list to add user ids 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann a041acab65 extend-uid: allow changes to user ids in edit mode 2015-12-27 14:59:50 +01:00
Vincent BreitmoserandDominik Schürmann 5b6bc24a0c extend-uid: add option icon for edit action mode 2015-12-27 14:59:33 +01:00
Vincent BreitmoserandDominik Schürmann 50248bd570 extended: init tabs with loader info 2015-12-27 14:58:18 +01:00
Dominik Schürmann 6f74ba2f2d Fix some strings thanks to Alain-Olivier 2015-12-27 14:52:09 +01:00
Dominik Schürmann b523db2660 Remove unused layout 2015-12-22 14:07:42 +01:00
Dominik Schürmann 55479834ad Remove unused layout 2015-12-22 14:06:00 +01:00
Dominik Schürmann b55f6515c0 Use correct logger in LinkedIdsAdapter 2015-12-22 14:03:02 +01:00
Dominik Schürmann a4d24b01b8 Opt out from fullBackupContent for now 2015-12-22 14:02:48 +01:00
Dominik Schürmann 574d20e0c3 Remove spongycastle pkix dependency to stay below Androids dex limit 2015-12-22 13:34:26 +01:00
Dominik Schürmann b84c9a8fb6 Update spongycastle to 1.53 2015-12-22 13:31:55 +01:00
Dominik Schürmann cb365e450b Backup: Move FAQ button to last screen and simplify code 2015-12-22 11:51:53 +01:00
Dominik Schürmann 70801fbc2e Cleanup in HelpActivity 2015-12-22 11:30:40 +01:00
Dominik Schürmann dc2c4606e2 Update FAQ from website 2015-12-22 11:30:16 +01:00
Dominik Schürmann e08b2612e5 Improve how_to_import 2015-12-22 11:24:59 +01:00
Dominik Schürmann d87fd01990 Merge branch 'TedaLIEz-master' 2015-12-22 11:22:13 +01:00
Dominik Schürmann c9487b90f1 Merge branch 'master' of https://github.com/TedaLIEz/open-keychain into TedaLIEz-master 2015-12-22 11:19:38 +01:00
aLIEzTedandTedaLIEz 5aec8b409f Issue #1595
link to faq

link to app

Issue #1595

Issue#1595

Revert commits

Sorry for overhead annotation
2015-12-22 17:36:28 +08:00
Dominik Schürmann ae9a96bfad Default for theme setting 2015-12-22 02:04:02 +01:00
Dominik Schürmann 7e9ce855df Add hint to encrypt field 2015-12-22 01:52:47 +01:00
Dominik Schürmann 35e16b75b2 Follow notification style guidelines, dismiss permission notification on click 2015-12-22 01:46:11 +01:00
Dominik Schürmann 6c25cb1927 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-12-21 20:32:02 +01:00
Dominik Schürmann e7c9be9556 Make ContactHelper less static 2015-12-21 20:31:23 +01:00
Dominik Schürmann 92d2a052f1 Merge pull request #1633 from open-keychain/preference-fix
Fixed Keyserver and Contact Sync turning itself on
2015-12-20 23:31:04 +01:00
Adithya Abraham Philip 7d05a22ae5 fixed key update preference not turning off 2015-12-21 01:28:28 +05:30
Vincent Breitmoser 7baa649e47 set spongycastle submodule to correct commit 2015-12-17 13:28:03 +01:00
Vincent Breitmoser e32c1a9ced api: add micalg result extra to detached signature api call 2015-12-17 01:08:23 +01:00
Vincent Breitmoser 5344307e22 linked: correctly show errors in linked id wizard 2015-12-14 18:33:47 +01:00
Vincent Breitmoser c9d93785b2 some work on benchmark operation (affects only debug build) 2015-12-13 00:31:51 +01:00
Vincent Breitmoser 64fbb0daec encryptkeycompletionview: don't use prefix 2015-12-13 00:31:04 +01:00
Dominik Schürmann 8dd6313826 Nicer RESULT_INSECURE fallback for old API versions 2015-12-10 15:24:23 +01:00
Dominik Schürmann 1b141c61e1 Merge pull request #1610 from open-keychain/facebook
Basic Facebook Support
2015-12-10 13:16:28 +01:00
Dominik Schürmann a5d7a8ddf2 Merge pull request #1621 from TedaLIEz/master
Issue#1605 solved
2015-12-10 12:21:13 +01:00
TedaLIEz 2e8efbee85 Issue#1605 solved 2015-12-09 20:21:35 +08:00
Adithya Abraham Philip f29280bbb2 added Facebook links support, reworked Preferences 2015-12-06 00:46:52 +05:30
Dominik Schürmann ab66c68771 Merge pull request #1617 from fiaxh/sign_key_id_type
Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_ID
2015-12-03 11:42:20 +01:00
fiaxh a0b46b0d3b Return EXTRA_SIGN_KEY_ID = 0L for "none" key chosen for ACTION_GET_SIGN_KEY_ID 2015-12-03 09:24:19 +00:00
Vincent Breitmoser cb1527e2a1 encryptkeycompletionview: don't initialize to null on attach 2015-11-30 19:01:06 +01:00
Vincent Breitmoser df219b61c6 move custm api permission methods into helper class (composition over inheritance) 2015-11-27 23:40:04 +01:00
Dominik Schürmann 984c91d62c Note about transitive deps 2015-11-24 11:25:11 +01:00
Dominik Schürmann 3611200123 Version 3.7 2015-11-24 00:06:00 +01:00