Commit Graph

1897 Commits

Author SHA1 Message Date
Thialfihar
2857de4d5a Import R and BuildConfig explicitly 2015-06-26 14:56:47 +02:00
Vincent Breitmoser
51d35c7a83 instrument: first couple of tests for OpenPGP API 2015-06-26 01:59:11 +02:00
Vincent Breitmoser
88c86e1945 use KeyAdapter for AllowedKeysListFragment 2015-06-26 01:59:11 +02:00
Vincent Breitmoser
3af5ba0343 fix warnings in PassphraseCacheService 2015-06-26 01:59:11 +02:00
Adithya Abraham Philip
c748b3e896 fixed fingerprint mismatch issue 2015-06-25 08:40:07 +05:30
Dominik Schürmann
74cef32d25 Notification: follow design guidelines, fix #1313 2015-06-24 13:08:37 +02:00
Dominik Schürmann
8cd7e29540 New notify icon 2015-06-24 11:35:11 +02:00
moparisthebest
7366f14d32 New all-white status bar icon to fix issue #1356 2015-06-22 22:40:15 -04:00
Vincent Breitmoser
7c3518a011 more stable nullable behavior in OperationLog 2015-06-18 13:16:38 +02:00
Vincent Breitmoser
f5aa36ef9f fix rest of resource leaks (#1351) 2015-06-17 21:30:25 +02:00
Vincent Breitmoser
5895385153 fix a couple of resource leaks (#1351) 2015-06-17 20:26:06 +02:00
Vincent Breitmoser
5e77117232 fix filesize reporting in decrypt operation 2015-06-17 18:53:46 +02:00
Vincent Breitmoser
04e9137b66 instrument: use contrib drawer methods, respect passphrase cache 2015-06-17 18:53:05 +02:00
Vincent Breitmoser
3755bce9ce fix nullpointer in ViewKeyFragment 2015-06-17 18:53:02 +02:00
Vincent Breitmoser
7d371d8a39 fix returned text of cleartext verify 2015-06-17 18:53:02 +02:00
Vincent Breitmoser
f677446d51 use KeyAdapter in KeySpinner 2015-06-17 18:53:01 +02:00
Vincent Breitmoser
84165c092e fix symmetric text decryption 2015-06-17 18:53:00 +02:00
Vincent Breitmoser
312cb38848 preliminary EditKeyTest 2015-06-17 18:52:59 +02:00
Vincent Breitmoser
b8305d43dc return actual last log entry, including from sublogentryparcels 2015-06-17 18:52:59 +02:00
Vincent Breitmoser
b7834b4326 fix recursive log in modifySecretKeyRing 2015-06-17 18:52:58 +02:00
Vincent Breitmoser
ae199313ee instrument: change handling in PassphraseDialogActivity to work with espresso 2015-06-17 18:52:21 +02:00
Vincent Breitmoser
db0266c0ae instrument: work on instrumentation tests 2015-06-17 18:52:20 +02:00
Vincent Breitmoser
34c7252048 add extra to disregard first-time dialog to main activity 2015-06-17 18:52:19 +02:00
Vincent Breitmoser
7998b2a262 instrument: add helper method for snackbar checking 2015-06-17 18:52:19 +02:00
Vincent Breitmoser
66e7876abd add ToolableViewAnimator 2015-06-17 18:51:45 +02:00
Vincent
655cdfbbee Merge pull request #1338 from josecastillo/development
Improved smart card error handling
2015-06-12 15:00:16 +02:00
Joey Castillo
cda8b63bb4 Replace AssertionErrors with snackbar notifications, fix style issues. 2015-06-11 11:52:09 -04:00
Vincent Breitmoser
5d652e4c41 some bugfixes for new CryptoOperationFragment 2015-06-11 17:10:40 +02:00
Vincent Breitmoser
244f92ed57 Merge remote-tracking branch 'origin/master' into v/eventbus 2015-06-11 15:34:55 +02:00
Joey Castillo
14226461c1 Improved smart card error handling 2015-06-10 20:11:55 -04:00
Dominik Schürmann
6749b03d9a Fix debug/release build separation 2015-06-11 00:31:41 +02:00
Dominik Schürmann
aa31abd93f Allow debug build besides release build 2015-06-10 19:47:29 +02:00
Vincent Breitmoser
61dce088c2 backport CryptoOperationFragment changes without eventbus 2015-06-10 15:45:10 +02:00
Vincent Breitmoser
9b6416943b Merge remote-tracking branch 'origin/master' into v/eventbus 2015-06-10 14:49:02 +02:00
Vincent Breitmoser
0505af7520 select correct item in drawer on backstack change in main activity 2015-06-08 16:18:16 +02:00
Vincent Breitmoser
074b6633b0 eventbus: initial attempt, replace messenger hack with eventbus communication 2015-06-06 23:17:42 +02:00
Adithya Abraham Philip
82f3d70224 prevent null fragments on activity death 2015-06-03 19:01:01 +05:30
Vincent Breitmoser
7cfc0d80d0 Merge branch 'v/sticky-prefs' 2015-06-03 01:23:51 +02:00
Vincent Breitmoser
ecfbc743f3 keep prefernces individual per dialog (affects only compression) 2015-06-03 01:21:06 +02:00
Vincent Breitmoser
bd5a5c0138 Partially revert "switch to native DialogFragment, fix some nullpointers", but keep nullpointer fixes
This reverts commit 403f74f558.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
2015-06-03 01:16:44 +02:00
Vincent Breitmoser
b3ebb64666 hide invoke nfc button in android < 5 2015-06-03 01:08:32 +02:00
Dominik Schürmann
e2988c2a68 Fix comments in service 2015-06-01 15:52:07 +02:00
Adithya Abraham Philip
ebba24cbd8 corrected indentation 2015-06-01 17:44:44 +05:30
Adithya Abraham Philip
6bc40d12ad renamed KeychainIntentService to KeychainService 2015-06-01 17:43:00 +05:30
Adithya Abraham Philip
14a08361e5 merged services 2015-06-01 17:41:44 +05:30
Dominik Schürmann
af5fc66229 Merge pull request #1317 from adithyaphilip/master
Merge key from Keyserver with that from Keybase instead of replacing
2015-06-01 10:15:46 +02:00
Vincent Breitmoser
403f74f558 switch to native DialogFragment, fix some nullpointers 2015-05-31 19:45:25 +02:00
Vincent Breitmoser
1bc14ab6ae revert some accidentally committed cruft 2015-05-31 05:22:14 +02:00
Vincent Breitmoser
cf5fadae76 implement sticky preferences 2015-05-31 05:18:58 +02:00
Vincent Breitmoser
3976eadf06 handle empty passphrases in PassphraseDialogActivity 2015-05-31 05:16:41 +02:00