cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,668 Commits 1 Branch 0 Tags
fe9c802bbb318aef9cd2fbcaa85fc761b1797086
Commit Graph
4668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 8f367b7210 fix instrumentation test(s) 2015-06-13 21:50:57 +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 d57324aa4b Merge pull request #1331 from open-keychain/v/eventbus 
replace messenger hack with eventbus
 2015-06-12 14:59:26 +02:00
Dominik Schürmann 4f55b1f5d1 Use svg for build status 2015-06-11 22:41:17 +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 baea318470 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-11 17:12:07 +02: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
Dominik Schürmann 98ba424576 Fix coveralls 2015-06-11 13:12:45 +02:00
Dominik Schürmann 7f67658de9 Try coveralls support 2015-06-11 12:58:21 +02:00
Dominik Schürmann b856d82ae2 Jacoco support for local unit tests 2015-06-11 12:54:15 +02:00
Joey Castillo 14226461c1 Improved smart card error handling 2015-06-10 20:11:55 -04:00
Dominik Schürmann 7a5121894e Remove unused deps, fix travis 2015-06-11 00:36:05 +02:00
Dominik Schürmann 7c32098211 Add missing WorkaroundBuildConfig 2015-06-11 00:32:18 +02:00
Dominik Schürmann 6749b03d9a Fix debug/release build separation 2015-06-11 00:31:41 +02:00
Dominik Schürmann d16b09b2a6 Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds 2015-06-11 00:05:13 +02:00
Dominik Schürmann 05fcbcae7b Temporary fix for testDebug 2015-06-10 22:35:06 +02:00
Dominik Schürmann 260364e267 Use authority res strings 2015-06-10 20:00:29 +02:00
Dominik Schürmann aa31abd93f Allow debug build besides release build 2015-06-10 19:47:29 +02:00
Vincent Breitmoser c8790f404a multi-decrypt: switch to cardview 2015-06-10 17:40:00 +02: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 8da88f33bc fix unit tests 2015-06-10 17:09:55 +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
Dominik Schürmann e6ea98fabc Improve FAQ entry for file manager 2015-06-08 22:46:08 +02:00
Dominik Schürmann 47f98493e2 Improve FAQ entry for file manager 2015-06-08 22:44:26 +02:00
Dominik Schürmann 28cb70d7dc Merge pull request #1333 from VPhantom/patch-1 
Explicit mention of dependency on 3rd party tool
 2015-06-08 22:41:37 +02:00
Stéphane Lavergne 1045deb0e3 Explicit mention of dependency on 3rd party tool 
I had the darnest time remembering my old APG days where something was said in passing about, unlike any other application I know, the need here for OI File Manager (or others, later on) to be able to select local files.  I'm sure I'm not the only person who could benefit from this reminder. :)
 2015-06-08 16:31:48 -04:00
Vincent Breitmoser 0505af7520 select correct item in drawer on backstack change in main activity 2015-06-08 16:18:16 +02:00
Dominik Schürmann 69c8ecd553 Merge pull request #1327 from adithyaphilip/fix-null 
Prevent NullPointerException due to Activity death
 2015-06-08 09:55:13 +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 5917303c1d update spongycastle with branch-specific patch stack 2015-06-03 01:38:40 +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
Dominik Schürmann e2988c2a68 Fix comments in service 2015-06-01 15:52:07 +02:00
Dominik Schürmann 7d29901f64 Merge pull request #1320 from adithyaphilip/merge-services-new 
Merged CloudImportService and KeychainIntentService into KeychainService
 2015-06-01 15:50:09 +02:00
Adithya Abraham Philip ebba24cbd8 corrected indentation 2015-06-01 17:44:44 +05:30