cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,366 Commits 1 Branch 0 Tags
b09336574769ea4098a29d52fa8cd4303b1f0500
Commit Graph
5366 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominik Schürmann a5fedb2525 Pull from transifex 2015-11-24 00:03:17 +01:00
Dominik Schürmann 2f84561c19 3.7 changelog 2015-11-23 23:59:36 +01:00
Dominik Schürmann 298043f708 Pull from transifex 2015-11-23 23:54:04 +01:00
Dominik Schürmann 4319df4dcf externalize notification helper for icon 2015-11-23 23:40:24 +01:00
Dominik Schürmann c4f11c4535 Fix strings, thanks to Alain-Olivier 2015-11-23 23:39:56 +01:00
Dominik Schürmann dfed60f442 re-enable contact sync by default 2015-11-23 23:27:01 +01:00
Dominik Schürmann 01b89d1d9c Revert "Add first time wizard for sync settings" 
This reverts commit cd601988db.
 2015-11-23 23:25:56 +01:00
Dominik Schürmann af8fd8db69 No need to delete by raw contact id 2015-11-23 12:57:26 +01:00
Dominik Schürmann eda53d42de Disable contact sync by default on Android >= 6 2015-11-23 11:43:44 +01:00
Dominik Schürmann cd601988db Add first time wizard for sync settings 2015-11-23 10:46:32 +01:00
Dominik Schürmann 66a8fe8bbd Update proguard workaround for support lib 23.1.1 2015-11-23 09:31:31 +01:00
Dominik Schürmann 5a233eab0e API version 10 2015-11-23 09:26:12 +01:00
Dominik Schürmann 69bb27a25c Fix potential NPE 2015-11-23 09:19:19 +01:00
Dominik Schürmann c5bcbce28f Show notification when READ_CONTACTS permission is denied in sync service, hide linked contact card if permission is denied 2015-11-23 09:06:12 +01:00
Dominik Schürmann dc631e5c15 Request contact permission in settings for contact linking 2015-11-23 01:21:09 +01:00
Dominik Schürmann e1b54137aa Request READ_EXTERNAL_STORAGE permission on key import 2015-11-19 18:51:13 +01:00
Dominik Schürmann 2315827635 FileHelperLollipop: Check by comparing UID instead of checking files read permissions. This fixes sharing of file uris from sdcard 2015-11-19 18:35:19 +01:00
Dominik Schürmann 562c0546c6 Handle denied storage permission, use ContentResolver.SCHEME_FILE constant 2015-11-19 18:26:06 +01:00
Dominik Schürmann 0eac497754 Request READ_EXTERNAL_STORAGE permission for encryption of files (shared by file managers to OpenKeychain) 2015-11-19 16:47:31 +01:00
Dominik Schürmann 2fe508c60e Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-19 14:00:17 +01:00
Dominik Schürmann 62918c5718 Check if NFC is available before displaying button 2015-11-19 14:00:13 +01:00
Vincent d4c121c2af Merge pull request #1543 from rohands/issue_mouseover_hints 
mouseover hints
 2015-11-16 03:10:02 +01:00
Vincent Breitmoser ba7deca7d8 travis: add --stacktrace parameter 2015-11-16 00:12:29 +01:00
Vincent Breitmoser 89d1b6e4dc fix unit tests (IllegalStateException) 2015-11-16 00:05:02 +01:00