Commit Graph
100 Commits
Author SHA1 Message Date
Dominik Schürmann c4ee00bd39 OpenPGP not PGP 2015-01-07 00:01:57 +01:00
Dominik Schürmann 6ec85b0550 Clearup after lockpattern experiments 2015-01-06 19:29:51 +01:00
Dominik Schürmann af762a65a0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-06 14:52:12 +01:00
Dominik Schürmann e34ad18ed2 Passphrase wizard tests 2015-01-06 14:52:07 +01:00
Dominik Schürmann ccde6add70 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-29 23:17:01 +01:00
Dominik Schürmann 610c4780f1 New work on PIN and lock pattern UI 2014-12-29 23:16:54 +01:00
Dominik Schürmann 320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann bf4762ef6f Cleanup UncachedKeyringTest 2014-12-29 13:32:28 +01:00
Dominik Schürmann ce34192dbb Remove restriction for max parallel forks for gradle tests 2014-12-28 21:56:19 +01:00
Dominik Schürmann 56325851dc Remove necessity to prepare tests via shell script 2014-12-28 21:48:49 +01:00
Dominik Schürmann d8e6e51452 Fix test for future creation timestamps to account for loosen timestamp check 2014-12-28 21:44:48 +01:00
Dominik Schürmann a86abe04cd Allow for creation date to be in the future up to one day to account for diverging clocks on different systems for fresh keys 2014-12-28 20:57:03 +01:00
Dominik Schürmann 7dbf0abf7b Fix crash on first time wizard 2014-12-28 19:06:17 +01:00
Dominik Schürmann a110089b4d New icon for Lollipop release 2014-12-14 19:23:28 +01:00
Dominik Schürmann f8e2dd681b Update plugin to 1.0 2014-12-12 14:31:41 +01:00
Dominik Schürmann 38698bd891 Merge branch 'master' into development 2014-12-05 13:50:06 +01:00
Dominik Schürmann 99047aae6d Add passhrase attacking screens for wiki 2014-12-05 13:47:25 +01:00
Dominik Schürmann fda01143e0 Fix travis 2014-12-05 00:27:33 +01:00
Dominik Schürmann 584ba94f20 Fix travis 2014-12-05 00:13:38 +01:00
Dominik Schürmann b4c5337624 Fix travis 2014-12-04 23:37:57 +01:00
Dominik Schürmann 26341a325b Update target and support libs to SDK 21, fixing compile issues 2014-12-04 22:48:40 +01:00
Dominik Schürmann ac1cbad3ff Switch from mavenCentral to jcenter 2014-12-04 20:02:06 +01:00
Dominik Schürmann 9df7147c8b Fix jacoco 2014-12-04 19:58:08 +01:00
Dominik Schürmann 6b9749289f Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-04 19:44:27 +01:00
Dominik Schürmann 389d191448 Merge branch 'master' into development 2014-12-04 19:43:41 +01:00
Dominik Schürmann 8f5295f2d1 Update to com.novoda:gradle-android-test-plugin:0.10.0, no snapshot version anymore, jacoco disabled for now 2014-12-04 19:42:30 +01:00
Dominik Schürmann 450ac161b9 Set version to 3.2beta1 2014-12-04 19:26:10 +01:00
Dominik Schürmann e41dcd3795 Update for Android Studio 1.0 RC 2014-12-04 19:07:38 +01:00
Dominik Schürmann d50213e0b0 Update for Android Studio 1.0 RC 2014-12-04 19:05:17 +01:00
Dominik Schürmann 4a9e3ccc83 Merge pull request #1011 from cketti/fix_k9_references
Fix spelling of 'K-9 Mail' in FAQ
2014-11-27 11:25:34 +01:00
Dominik Schürmann a805069c59 more cleanup 2014-11-21 23:55:04 +01:00
Dominik Schürmann dd65d10406 NFC activity design 2014-11-21 13:31:43 +01:00
Dominik Schürmann fc32f5f9d4 Minor code cleanup 2014-11-21 12:41:39 +01:00
Dominik Schürmann a798d95411 Update keybase and minidns libs 2014-11-04 18:16:42 +01:00
Dominik Schürmann 9de76bb903 Version 3.1.2 2014-11-02 17:54:33 +01:00
Dominik Schürmann f3da3b31e5 Pull from transifex 2014-11-02 17:54:10 +01:00
Dominik Schürmann 602930d929 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-11-02 17:50:38 +01:00
Dominik Schürmann 9dc8c0d506 Changelog 2014-11-02 17:50:31 +01:00
Dominik Schürmann f10ec91380 Version 3.1.1 2014-10-30 12:54:17 +01:00
Dominik Schürmann 148c9a5c62 Revert "Version 3.1.1"
This reverts commit 8461f953f6.
2014-10-30 12:54:01 +01:00
Dominik Schürmann 8461f953f6 Version 3.1.1 2014-10-30 12:53:21 +01:00
Dominik Schürmann f4d0e5250b Pull from transifex 2014-10-30 12:52:33 +01:00
Dominik Schürmann 26a4cf2a56 Changelog 3.1.1 2014-10-30 12:48:06 +01:00
Dominik Schürmann 18255e331b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 12:44:13 +01:00
Dominik Schürmann 30c3021fea Always use INTEGER instead of BOOLEAN in database to avoid confusion 2014-10-29 23:41:10 +01:00
Dominik Schürmann 3e601431ea Version 3.1 2014-10-26 23:32:57 +01:00
Dominik Schürmann e02b2ab30c Pull from transifex 2014-10-26 23:32:34 +01:00
Dominik Schürmann 5f20abdb26 Pull from transifex 2014-10-26 23:23:30 +01:00
Dominik Schürmann 893a4620c1 Changelog 3.1 2014-10-26 23:15:46 +01:00
Dominik Schürmann e1b0908290 Fix crash with NotFoundException 2014-10-26 22:49:34 +01:00
Dominik Schürmann 1e5797387a Rename multi certify files to certify 2014-10-26 22:41:40 +01:00
Dominik Schürmann be31815ee8 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 22:38:35 +01:00
Dominik Schürmann fa73362a9f Fix notify after certify 2014-10-26 22:38:30 +01:00
Dominik Schürmann 4aed570ee3 3.1beta1 2014-10-26 05:28:57 +01:00
Dominik Schürmann aaa4753503 Fix decrypt intent api 2014-10-26 02:00:52 +01:00
Dominik Schürmann dd007e9664 Hide keyboard in safe slinger activity 2014-10-26 02:36:57 +02:00
Dominik Schürmann 3325ff57a7 Use new safe slinger activity from share tab 2014-10-26 02:34:51 +02:00
Dominik Schürmann 4631f45ed7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 02:17:26 +02:00
Dominik Schürmann be3e6ae6ef Move advanced info into own activity 2014-10-26 02:16:39 +02:00
Dominik Schürmann 3059007995 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 01:09:46 +02:00
Dominik Schürmann 97baa0e52f Keyboard tests 2014-10-26 01:09:35 +02:00
Dominik Schürmann 825baeee1b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 00:38:31 +02:00
Dominik Schürmann 8257e450f9 Fixes from transifex 2014-10-26 00:38:25 +02:00
Dominik Schürmann f51aebf52d Move some multi select items in overflow menu, rename import 2014-10-26 00:30:10 +02:00
Dominik Schürmann 94693efbe5 Fail on unknown key ids on API, Key item design consistency for API 2014-10-26 00:19:14 +02:00
Dominik Schürmann e4391c282d Fix layout of select key adapter 2014-10-26 00:15:35 +02:00
Dominik Schürmann 74bac3ea36 Remove empty layout 2014-10-25 23:36:48 +02:00
Dominik Schürmann 94e7bbb67b Remove PassphraseDialogFragment 2014-10-25 22:56:27 +02:00
Dominik Schürmann ad60ec2d00 Remove old certify activity 2014-10-25 22:55:16 +02:00
Dominik Schürmann c1ef9ed149 Use passphrase dialog activity instead of passphrase dialog 2014-10-25 22:53:35 +02:00
Dominik Schürmann 1099382250 Remove old exception handling code from loaders 2014-10-25 22:31:28 +02:00
Dominik Schürmann 8dddc82f69 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 22:25:14 +02:00
Dominik Schürmann 4f37c88ea7 Fix color in import list 2014-10-25 22:25:11 +02:00
Dominik Schürmann c2e7c2416f Remove tabs from import keys activity 2014-10-25 22:05:55 +02:00
Dominik Schürmann 71e3fb5380 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 21:15:12 +02:00
Dominik Schürmann 0abfff0b0e Fixes and icons for apps list, also add Password Store 2014-10-25 21:15:05 +02:00
Dominik Schürmann d3e0e823e3 Fix result passing 2014-10-25 03:06:39 +02:00
Dominik Schürmann e11df08ea1 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:57:42 +02:00
Dominik Schürmann 339b283df5 Safeslinger fixesÄ 2014-10-25 02:57:33 +02:00
Dominik Schürmann 49b237d609 Fix safe slinger button 2014-10-25 02:42:13 +02:00
Dominik Schürmann 418f0970ab Fix safe slinger button 2014-10-25 02:41:20 +02:00
Dominik Schürmann 57a26a6cb3 Use selected number of users in safe slinger 2014-10-25 02:39:48 +02:00
Dominik Schürmann 2d992f19f7 Update safeslinger lib 2014-10-25 02:39:03 +02:00
Dominik Schürmann e332c664cf Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:38:09 +02:00
Dominik Schürmann 33b54ab03e Safe slinger activity preps 2014-10-25 02:38:06 +02:00
Dominik Schürmann 1cbedb60d6 Qr code button text 2014-10-24 00:44:26 +02:00
Dominik Schürmann b1c164bde0 remove space in on large devices in layouts where no drawer nav is shown 2014-10-24 00:39:33 +02:00
Dominik Schürmann 9447f8fdf9 Fix import from cloud 2014-10-24 00:30:58 +02:00
Dominik Schürmann bfc3774f02 Merge pull request #973 from timbray/development
Make the Certify screen a little more self-explanatory
2014-10-24 00:23:40 +02:00
Dominik Schürmann efa5a80eb6 Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2014-10-23 23:33:50 +02:00
Dominik Schürmann 1624cd8349 Start safe slinger activity 2014-10-23 23:31:50 +02:00
Dominik Schürmann e494beb58a Externalize QR Code scanning and import into its own activity for better code separation 2014-10-23 17:13:49 +02:00
Dominik Schürmann ecfa2288eb Fix crash on Android 5 2014-10-22 23:28:13 +02:00
Dominik Schürmann f4f16e62a2 consistency for import UI 2014-10-16 14:47:36 +02:00
Dominik Schürmann d09d4296da Silently fail on import on key import with ArrayIndexOutOfBoundsException 2014-10-16 13:36:21 +02:00
Dominik Schürmann 81935fe99b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-15 23:22:12 +02:00
Dominik Schürmann 0cdcc90984 More consisitency 2014-10-15 23:22:08 +02:00
Dominik Schürmann 4e1053c6fa More color/icon consistency 2014-10-15 23:05:29 +02:00
Dominik Schürmann be9b483ee8 color experiments 2014-10-15 12:48:54 +02:00
Dominik Schürmann dc87557805 Group passphrase cache settings 2014-10-13 19:34:41 +02:00