cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,368 Commits 1 Branch 0 Tags
f8d6b0bb467cf126b3e1bf295f584b533280ebef
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann c249198279 Filinked_empty string 2016-01-04 10:41:43 +01:00
Dominik Schürmann a5f792a718 Check for ACTION_OPEN_DOCUMENT before starting activity 2016-01-04 10:28:51 +01:00
Dominik Schürmann 4057c97bd2 Fallback for ACTION_OPEN_DOCUMENT, hopefully fixes #1625 2016-01-04 00:32:44 +01:00
Dominik Schürmann 3b54c82dc0 Fix #1649 2016-01-04 00:26:31 +01:00
Dominik Schürmann 40c57b68dc Merge pull request #1652 from open-keychain/travis-memory 
Fix travis
 2016-01-04 00:11:50 +01:00
Dominik Schürmann ec9db1588a Run travis on non-container for https://github.com/travis-ci/travis-ci/issues/3695, including workaround for https://github.com/travis-ci/travis-ci/issues/5227 2016-01-04 00:02:29 +01:00
Dominik Schürmann b33d3f1b6c Log test results 2016-01-04 00:02:28 +01:00
Dominik Schürmann cdc42c94cc Travis: update build-tools 2016-01-03 23:11:12 +01:00
Dominik Schürmann 6197870e24 Tests: Use ECC where possible 2016-01-03 23:10:31 +01:00
Dominik Schürmann 376e02c4b4 Update dependencies 2016-01-03 23:10:30 +01:00
Dominik Schürmann b3ffc70675 Add gradle-versions-plugin 2016-01-03 20:31:03 +01:00
Dominik Schürmann cbdb1d3059 Update to spongycastle 1.54 2016-01-03 14:00:01 +01:00
Dominik Schürmann 91cb7a3b65 Fix code style 2016-01-02 18:49:13 +01:00
Dominik Schürmann 4c0240dd6c Temporary fix for #1636 2016-01-01 17:06:10 +01:00
Dominik Schürmann 3c937e858e Merge pull request #1584 from open-keychain/edit-redesign 
Inline Identity Edit
 2015-12-31 16:31:03 +01:00
Dominik Schürmann 6fb96ce790 Add change password menu item to view key 2015-12-31 16:29:55 +01:00
Dominik Schürmann bfa28fcb5e Upload to keyserver after editing identities 2015-12-31 15:49:50 +01:00
Dominik Schürmann 122705c24e Improve linked identity handling 2015-12-31 15:24:56 +01:00
Dominik Schürmann 373a3fc3f5 Edit identities design 2015-12-31 14:13:43 +01:00
Dominik Schürmann 269330f04f Add activity to edit user ids only 2015-12-30 16:47:42 +01:00
Dominik Schürmann 3f70511708 Add edit action to user id card, left align card actions per material design guidelines 2015-12-29 21:21:11 +01:00
Dominik Schürmann 621f8c2c70 Load key data in tabs independently from advanced activity. This decouples the fragments from the activity and allows to init the tabs before loading key data in the advanced activity. Fixes switching to the first tab when key has been edited. 2015-12-29 19:57:01 +01:00
Dominik Schürmann ea3b258469 use correct white add icon 2015-12-28 15:41:36 +01:00
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
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
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
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
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
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
Dominik Schürmann 4b594e4e75 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-13 23:17:38 +01:00
Dominik Schürmann 1963ca9c2d Move permission check to createOperationInput 2015-11-13 23:17:34 +01:00
Dominik Schürmann 0eade61cd4 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-13 17:36:25 +01:00
Dominik Schürmann c6ea0b6a07 Request READ_EXTERNAL_STORAGE for decryption 2015-11-13 17:36:16 +01:00
Dominik Schürmann ad03031d24 Update safeslinger lib 2015-11-13 15:15:27 +01:00
Dominik Schürmann dd5d3dbf4c Update support libs to 23.1.1 2015-11-13 15:01:51 +01:00
Dominik Schürmann 4a8a4e37d0 Use fixed version of mockito 2015-11-13 14:59:45 +01:00
Dominik Schürmann d6a1be825c Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-08 20:02:54 +01:00
Dominik Schürmann 89d016c49b Get whole public key via ACTION_GET_KEY 2015-11-08 20:02:50 +01:00
Dominik Schürmann 2f640980dd Cleanup settings activity 2015-11-08 19:29:51 +01:00
Dominik Schürmann 31a45759cc Add READ_EXTERNAL_STORAGE permission 2015-11-03 10:59:53 +01:00
Dominik Schürmann 8f070e2450 Support for Android 6 ACTION_PROCESS_TEXT 2015-11-02 19:16:24 +01:00
Dominik Schürmann 00c972b6a8 Properly hide fab in ViewKeyActivity, fixes #1580 2015-11-02 18:24:59 +01:00
Dominik Schürmann 989df66d18 Add travis components for SDK 23 2015-11-02 18:12:05 +01:00
Dominik Schürmann 59e3122731 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-11-02 18:10:05 +01:00
Dominik Schürmann ccdfd55f61 Add runtime permission check for QR Code activity 2015-11-02 18:10:00 +01:00
Dominik Schürmann 05df0a63b7 Fix API 23 regression for activities without layout, see http://stackoverflow.com/q/32169303 2015-11-02 18:09:41 +01:00
Dominik Schürmann c31f760110 Merge pull request #1578 from open-keychain/keyserver-sync-fix 
Reworked KeyserverSyncAdapterService
 2015-11-02 18:03:25 +01:00
Dominik Schürmann 0641b9cba6 comment git dependency again 2015-10-29 23:03:11 +01:00
Dominik Schürmann fbca191c8f update material drawer library 2015-10-29 23:01:16 +01:00
Dominik Schürmann 67a51cdfe3 Target SDK 23 and related fixes 2015-10-26 20:53:32 +01:00
Dominik Schürmann 33fea901e9 Update stickylistheaders, html-textview 2015-10-26 20:25:55 +01:00
Dominik Schürmann cf28da39c4 Update tokenautocomplete 2015-10-26 20:21:35 +01:00
Dominik Schürmann ddc0315b45 Update android-patternview, materialtabstrip, floatingactionbutton 2015-10-26 20:09:41 +01:00
Dominik Schürmann 96bed5ef1a Update zxing-android-embedded with new custom activity 2015-10-26 19:58:56 +01:00
Dominik Schürmann c04c698992 Version 3.6.1 2015-10-26 19:10:23 +01:00
Dominik Schürmann 65c402fbe0 Pull from transifex 2015-10-26 19:09:30 +01:00
Dominik Schürmann 6a04866ae6 Commit Github tokens 2015-10-26 12:29:05 +01:00