Commit Graph

1185 Commits

Author SHA1 Message Date
Vincent Breitmoser
09da00d800 drop clipboard backwards compatibility for api level < 11 2015-06-20 05:08:49 +02:00
Vincent Breitmoser
d11b7b58f1 allow encrypting to clipboard in EncryptFileFragment 2015-06-20 03:34:51 +02:00
Vincent Breitmoser
f6bc1dcca3 extract readTextFromUri into FileHelper 2015-06-20 03:34:21 +02:00
Vincent Breitmoser
25beeaceb5 more work on decrypt fragment ux 2015-06-20 03:22:26 +02:00
Vincent Breitmoser
b5501eeea6 working DisplayTextActivity, more input support in DecryptActivity 2015-06-20 01:35:33 +02:00
Vincent Breitmoser
36f3887c5f handle empty filename in decrypt list 2015-06-19 20:09:04 +02:00
Vincent Breitmoser
ae56f4f900 handle EXTRA_TEXT in decrypt activity 2015-06-19 19:45:27 +02:00
Vincent Breitmoser
d1ceb73eb0 save instance state in DecryptListFragment 2015-06-19 18:53:17 +02:00
Vincent Breitmoser
5e5febaee3 rename activities to match new purpose 2015-06-18 16:28:57 +02:00
Vincent Breitmoser
0cb868ff25 fix ToolableViewAnimator (againl) 2015-06-18 03:11:29 +02:00
Vincent Breitmoser
c11fef6e7c handle multiple input URIs and Intent.SEND_MULTIPLE 2015-06-18 03:10:59 +02:00
Vincent Breitmoser
f978aca8e5 fix typo in excluder activity name 2015-06-18 03:09:34 +02:00
Vincent Breitmoser
3b4ff4644d fix small oversight in ToolableViewAnimator 2015-06-18 02:09:50 +02:00
Vincent Breitmoser
7f3154ecea Merge branch 'master' into v/multi-decrypt 2015-06-17 21:33:31 +02:00
Vincent Breitmoser
f5aa36ef9f fix rest of resource leaks (#1351) 2015-06-17 21:30:25 +02:00
Vincent Breitmoser
374b21410e Merge branch 'v/instrument' into v/multi-decrypt
Conflicts:
	.travis.yml
	OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
2015-06-17 19:24:07 +02:00
Vincent Breitmoser
3755bce9ce fix nullpointer in ViewKeyFragment 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
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
Vincent Breitmoser
3b67992bab add ToolableViewAnimator 2015-06-11 18:30:39 +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
Joey Castillo
14226461c1 Improved smart card error handling 2015-06-10 20:11:55 -04:00
Vincent Breitmoser
a48de4cd84 fix progress for decrypt 2015-06-10 17:39:06 +02:00
Vincent Breitmoser
1697e22d19 Merge branch 'v/eventbus' into v/multi-decrypt
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
2015-06-10 17:12:22 +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
d43671b2ed multi-decrypt: fix progress with new CryptoFragment interfaces 2015-06-07 02:00:14 +02:00
Vincent Breitmoser
cfa2ecca61 WIP! Merge branch 'v/eventbus' into v/multi-decrypt
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
2015-06-07 00:05:14 +02:00
Vincent Breitmoser
b779211f55 Merge branch 'master' into v/multi-decrypt
this also fixes weird-bug

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
	OpenKeychain/src/main/res/values/strings.xml
2015-06-06 23:40:22 +02:00
Vincent Breitmoser
074b6633b0 eventbus: initial attempt, replace messenger hack with eventbus communication 2015-06-06 23:17:42 +02:00
Vincent Breitmoser
fa61438306 multi-decrypt: implement save operation (missing actual copy) 2015-06-03 17:01:29 +02:00
Vincent Breitmoser
6db9de221c multi-decrypt: working context menu 2015-06-03 16:47:46 +02:00
Adithya Abraham Philip
82f3d70224 prevent null fragments on activity death 2015-06-03 19:01:01 +05:30
Vincent Breitmoser
5496b42fe6 get back to a working state 2015-06-03 02:04:43 +02:00
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
Vincent Breitmoser
441704f163 multi-decrypt: working in principle 2015-06-02 22:19:28 +02:00
Vincent Breitmoser
fc9a7bfcb3 multi-decrypt: working recyclerview which decrypt files sequentially, ui in progress 2015-06-02 12:14:27 +02:00
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