aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-11145-247/+255
|\
| * Fix coverallsDominik Schürmann2015-06-111-0/+5
| |
| * Try coveralls supportDominik Schürmann2015-06-113-1/+4
| |
| * Jacoco support for local unit testsDominik Schürmann2015-06-112-3/+38
| |
| * Remove unused deps, fix travisDominik Schürmann2015-06-112-7/+3
| |
| * Add missing WorkaroundBuildConfigDominik Schürmann2015-06-111-0/+14
| |
| * Fix debug/release build separationDominik Schürmann2015-06-1116-46/+33
| |
| * Use new officially supported way for local unit tests, many dependencies ↵Dominik Schürmann2015-06-11131-235/+152
| | | | | | | | upgraded for this, temporary disabled separate debug builds
| * Temporary fix for testDebugDominik Schürmann2015-06-102-5/+23
| |
| * Use authority res stringsDominik Schürmann2015-06-101-5/+2
| |
| * Allow debug build besides release buildDominik Schürmann2015-06-1013-15/+41
| |
* | multi-decrypt: switch to cardviewVincent Breitmoser2015-06-101-9/+15
| |
* | fix progress for decryptVincent Breitmoser2015-06-103-14/+37
| |
* | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-1023-259/+274
|\ \ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
| * | fix unit testsVincent Breitmoser2015-06-101-5/+5
| | |
| * | backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-1020-245/+237
| | |
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-103-5/+32
| |\|
| | * Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| | |
| | * Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| | |
| | * Merge pull request #1333 from VPhantom/patch-1Dominik Schürmann2015-06-081-1/+4
| | |\ | | | | | | | | Explicit mention of dependency on 3rd party tool
| | | * Explicit mention of dependency on 3rd party toolStéphane Lavergne2015-06-081-1/+4
| | |/ | | | | | | 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. :)
| | * select correct item in drawer on backstack change in main activityVincent Breitmoser2015-06-081-1/+25
| | |
| | * Merge pull request #1327 from adithyaphilip/fix-nullDominik Schürmann2015-06-081-3/+3
| | |\ | | | | | | | | Prevent NullPointerException due to Activity death
| | | * prevent null fragments on activity deathAdithya Abraham Philip2015-06-031-3/+3
| | |/
* | | multi-decrypt: fix progress with new CryptoFragment interfacesVincent Breitmoser2015-06-072-139/+73
| | |
* | | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-0722-572/+505
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
| * | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-0623-682/+523
| |/
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-0640-1380/+1393
|\| | | | | | | | | | | | | | | | | 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
| * Merge branch 'v/sticky-prefs'Vincent Breitmoser2015-06-037-32/+207
| |\
| | * keep prefernces individual per dialog (affects only compression)Vincent Breitmoser2015-06-034-10/+22
| | |
| | * implement sticky preferencesVincent Breitmoser2015-05-317-32/+195
| | |
| * | Partially revert "switch to native DialogFragment, fix some nullpointers", ↵Vincent Breitmoser2015-06-032-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | but keep nullpointer fixes This reverts commit 403f74f55830dcc5eaa027ccebb888a1122992d1. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
| * | hide invoke nfc button in android < 5Vincent Breitmoser2015-06-031-6/+11
| | |
| * | Fix comments in serviceDominik Schürmann2015-06-011-8/+8
| | |
| * | Merge pull request #1320 from adithyaphilip/merge-services-newDominik Schürmann2015-06-0131-1333/+1153
| |\ \ | | | | | | | | Merged CloudImportService and KeychainIntentService into KeychainService
| | * | corrected indentationAdithya Abraham Philip2015-06-011-271/+278
| | | |
| | * | renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-0128-198/+196
| | | |
| | * | merged servicesAdithya Abraham Philip2015-06-0125-581/+396
| |/ /
| * | Better use HEAD instead of master to link to filesDominik Schürmann2015-06-012-3/+3
| | |
| * | Merge pull request #1317 from adithyaphilip/masterDominik Schürmann2015-06-013-12/+13
| |\ \ | | | | | | | | Merge key from Keyserver with that from Keybase instead of replacing
| | * | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-313-12/+13
| | |/
| * | Fix links to branchDominik Schürmann2015-06-012-2/+2
| | |
* | | multi-decrypt: implement save operation (missing actual copy)Vincent Breitmoser2015-06-033-53/+86
| | |
* | | multi-decrypt: working context menuVincent Breitmoser2015-06-034-5/+93
| | |
* | | get back to a working stateVincent Breitmoser2015-06-031-3/+5
| | |
* | | update spongycastle with branch-specific patch stackVincent Breitmoser2015-06-031-0/+0
| | |
* | | multi-decrypt: working in principleVincent Breitmoser2015-06-025-69/+392
| | |
* | | multi-decrypt: working recyclerview which decrypt files sequentially, ui in ↵Vincent Breitmoser2015-06-025-243/+445
| | | | | | | | | | | | progress
* | | check for cached session keys in some testsVincent Breitmoser2015-06-011-0/+12
| | |
* | | multi-decrypt: first steps, split up DecryptFilesFragmentVincent Breitmoser2015-06-015-247/+549
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 21:11:22 +0000