cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,493 Commits 1 Branch 0 Tags
2e69952326a034bb9f1bdba4573adc9af9be3c2b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 568e0ff380 Merge pull request #1737 from runnerway/backup-code-fix 
Fix backup code comparison
 2016-03-02 00:21:27 +01:00
Dominik Schürmann 067d5fd0b0 Comment out verification for submodules 2016-02-29 23:15:27 +01:00
Dominik Schürmann 3fd5f2c097 Update to support lib 23.2.0 2016-02-29 23:13:51 +01:00
Dominik Schürmann ff0edb2bfe Merge branch 'master' of github.com:open-keychain/open-keychain 2016-02-23 16:06:59 +01:00
Dominik Schürmann 73ce6fc7bb Passthrough of data Intent in methods of ApiPendingIntentFactory instead of constructor 2016-02-23 16:06:54 +01:00
Dominik Schürmann c1d268a5ec Merge branch 'unyoungwax-qr-code-fullscreen' 2016-02-23 10:57:33 +01:00
Dominik Schürmann 0784a0b430 Merge pull request #1722 from open-keychain/api-seperation 
Better seperation of remote activities
 2016-02-22 15:21:40 +01:00
Dominik Schürmann f54f12c48c Extend documentation, proper method naming, use of deprecated method annotation 2016-02-22 15:19:06 +01:00
Dominik Schürmann 6379ce1faa Use FLAG_IMMUTABLE 2016-02-22 15:06:45 +01:00
Dominik Schürmann d1eacf9b27 Move PendingIntent creation into factory 2016-02-22 15:06:45 +01:00
Dominik Schürmann 15488c5445 Split remote methods from activities for better seperation 2016-02-22 15:06:45 +01:00
Dominik Schürmann eef27a544f Extract service parts from SecurityTokenOperationActivity 2016-02-22 15:06:45 +01:00
Dominik Schürmann c9018e1844 Use BC provider as default one 2016-02-21 17:23:25 +01:00
Dominik Schürmann bb997920f5 Split RemoteServiceActivity into multiple activities 2016-02-15 13:25:55 +01:00
Dominik Schürmann 0b00410123 travis: use new hostname addon instead of workaround 2016-02-10 20:02:50 +01:00
Dominik Schürmann e593ca87d2 Merge pull request #1716 from open-keychain/backup-v2 
Backup Format v2
 2016-02-10 19:14:56 +01:00
Dominik Schürmann 0e22813f03 Fix landscape orientation 2016-02-10 19:09:55 +01:00
Dominik Schürmann 0feb4d074c Use non-breaking spaces for backup code MaskedEditText 2016-02-10 18:48:27 +01:00
Dominik Schürmann a2ea509f06 Backup format v2: redesign restore dialog 2016-02-10 18:48:27 +01:00
Dominik Schürmann 713f3076f4 Backup format v2: redesigned backup code fragment with masked edit text 2016-02-10 18:48:27 +01:00
Dominik Schürmann 923b543e4d Add masked-edittext library 2016-02-10 18:48:27 +01:00
Dominik Schürmann a94713103b Merge pull request #1705 from fidesmo/feature-better-transaction-animation 
Better transaction animation
 2016-02-10 17:44:52 +01:00
Dominik Schürmann 751298a4d8 Fix EUR symbol 2016-02-10 12:34:44 +01:00
Dominik Schürmann c22e2baa79 Fix SecurityException on Android 6 due to remove contacts on disabled sync 2016-02-09 21:14:07 +01:00
Dominik Schürmann b44f73c819 Fix jacoco task 2016-02-09 21:02:43 +01:00
Dominik Schürmann 2bf9634fd6 Add donation fragment 2016-02-09 20:48:24 +01:00
Dominik Schürmann 2249b025bd Add ignore = dirty to submodules config 2016-02-09 18:05:41 +01:00
Dominik Schürmann 43e7956959 Merge pull request #1715 from open-keychain/bouncy 
Switch to Bouncy Castle
 2016-02-09 17:57:55 +01:00
Dominik Schürmann 08393bc5c3 Exclude robolectric's transitive bouncycastle dependency 2016-02-09 01:00:40 +01:00
Dominik Schürmann fa2958c65a Remove leftovers from spongycastle 2016-02-09 00:34:16 +01:00
Dominik Schürmann 79db5c0ebe Replace spongycastle with bouncycastle 2016-02-09 00:24:46 +01:00
Dominik Schürmann 55b4790abd Add bouncycastle submodule 2016-02-09 00:22:20 +01:00
Dominik Schürmann 70662e21b0 Remove spongycastle submodule 2016-02-09 00:21:04 +01:00
Dominik Schürmann 2c7e5ab8df Merge pull request #1713 from open-keychain/unlink-contact 
Deletes linked OpenKeychain contacts if sync is disabled
 2016-02-06 14:17:49 +01:00
Dominik Schürmann cbf6f15d91 Fix number keypad preference 2016-02-04 12:50:21 +01:00
Dominik Schürmann 10ce81bd60 Merge pull request #1706 from open-keychain/keyserverservice-fix 
Prevent Rare KeyserverSyncAdapterService Crash
 2016-01-30 19:38:21 +01:00
Dominik Schürmann 025d2c5d29 Merge pull request #1683 from eighthave/master 
allow "panic button" apps to clear all passphrases
 2016-01-26 19:58:08 +01:00
Dominik Schürmann 09b80e0368 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-01-20 12:45:50 +01:00
Dominik Schürmann 681a201a69 No PendingIntent for RESULT_NO_SIGNATURE, RESULT_INVALID_SIGNATURE 2016-01-20 12:45:44 +01:00
Dominik Schürmann d8235e0013 Lowercase ttl strings 2016-01-14 13:15:29 +01:00
Dominik Schürmann 8cd28036ef Merge pull request #1614 from fidesmo/feature-introduce-nfc-handling-via-nordpol 
Use Nordpol for BaseNfcActivity
 2016-01-13 14:38:40 +01:00
Dominik Schürmann d030f4f203 Version 3.8.2 2016-01-13 14:28:50 +01:00
Dominik Schürmann 5d912657ca Pull from transifex 2016-01-13 14:28:31 +01:00
Dominik Schürmann 808a9e4f54 Version 3.8.1 2016-01-12 15:18:05 +01:00
Dominik Schürmann 2c4bf2fb51 Add facebook key import to changelog 2016-01-12 01:05:27 +01:00
Dominik Schürmann 37ad772c39 Version 3.8 2016-01-11 18:33:42 +01:00
Dominik Schürmann 49dc5166cd Pull from transifex 2016-01-11 18:33:16 +01:00
Dominik Schürmann 5e3e6e2d62 Fix singleTop definitions 2016-01-11 18:04:09 +01:00
Dominik Schürmann c68b39211e Merge branch 'master' of github.com:open-keychain/open-keychain 2016-01-11 17:39:59 +01:00
Dominik Schürmann 81f23e8b7f Merge pull request #1666 from open-keychain/file-import-fix 
Fixed File Import issue due to onResumeFragments
 2016-01-11 17:39:53 +01:00
Dominik Schürmann baf0735c96 Merge branch 'master' of github.com:open-keychain/open-keychain 2016-01-11 17:35:20 +01:00
Dominik Schürmann 900c80c25c Changelog 3.8 2016-01-11 17:35:15 +01:00
Dominik Schürmann 574bb4ff45 Remove old screenshots, move api demo screenshots 2016-01-11 09:22:53 +01:00
Dominik Schürmann 5f0b07773e Pull from transifex 2016-01-11 08:40:01 +01:00
Dominik Schürmann fd3a1e900e Move edit key configuration to menu 2016-01-11 08:32:41 +01:00
Dominik Schürmann f691ef2a26 Error out when editing a stripped key 2016-01-11 08:13:51 +01:00
Dominik Schürmann aa924c2560 Add transifex advanced resource 2016-01-11 07:45:01 +01:00
Dominik Schürmann cc917857b0 Advanced screen, warning fragment 2016-01-11 07:42:00 +01:00
Dominik Schürmann 93327dccce Use tor icon for settings screen 2016-01-11 07:39:35 +01:00
Dominik Schürmann 0fd5b45df9 Use more generic 'Security Token' where possible, add sutitle to create key what tokens are supported 2016-01-10 17:17:57 +01:00
Dominik Schürmann 9163b93a90 Merge pull request #1597 from open-keychain/inline-ttl 
Select time to remember password in dialog
 2016-01-06 18:20:53 +01:00
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