aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * fix rest of resource leaks (#1351)Vincent Breitmoser2015-06-171-0/+1
| |
* | Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-175-58/+43
|\| | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| * nicer preview of decrypt_text_fragment layoutVincent Breitmoser2015-06-171-0/+3
| |
| * use KeyAdapter in KeySpinnerVincent Breitmoser2015-06-172-57/+19
| |
| * improve preview of ViewKeyActivity layoutVincent Breitmoser2015-06-171-1/+10
| |
| * (minor) layout changesVincent Breitmoser2015-06-171-1/+2
| |
| * add ToolableViewAnimatorVincent Breitmoser2015-06-171-0/+4
| |
| * Merge pull request #1338 from josecastillo/developmentVincent2015-06-121-0/+11
| |\ | | | | | | Improved smart card error handling
| | * Replace AssertionErrors with snackbar notifications, fix style issues.Joey Castillo2015-06-111-8/+11
| | |
| | * Improved smart card error handlingJoey Castillo2015-06-101-0/+8
| | |
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-112-2/+2
| |\|
* | | fix status icon alignmentVincent Breitmoser2015-06-141-0/+2
| | |
* | | (minor) layout changesVincent Breitmoser2015-06-132-3/+2
| | |
* | | add ToolableViewAnimatorVincent Breitmoser2015-06-112-9/+16
| | |
* | | Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-112-2/+2
|\ \ \ | | |/ | |/|
| * | Allow debug build besides release buildDominik Schürmann2015-06-102-2/+2
| | |
* | | multi-decrypt: switch to cardviewVincent Breitmoser2015-06-101-9/+15
| | |
* | | Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-101-1/+4
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
| * | Merge remote-tracking branch 'origin/master' into v/eventbusVincent Breitmoser2015-06-101-1/+4
| |\|
| | * Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| | |
| | * Improve FAQ entry for file managerDominik Schürmann2015-06-081-1/+1
| | |
| | * 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. :)
* | | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-071-0/+1
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
| * | eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-061-0/+1
| |/
* | Merge branch 'master' into v/multi-decryptVincent Breitmoser2015-06-061-0/+10
|\| | | | | | | | | | | | | | | | | 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-031-0/+8
| |\
| | * implement sticky preferencesVincent Breitmoser2015-05-311-0/+8
| | |
| * | prevent keybase key replacing keyserver keyAdithya Abraham Philip2015-05-311-0/+1
| |/
* | multi-decrypt: implement save operation (missing actual copy)Vincent Breitmoser2015-06-031-3/+5
| |
* | multi-decrypt: working context menuVincent Breitmoser2015-06-033-0/+24
| |
* | multi-decrypt: working in principleVincent Breitmoser2015-06-021-15/+17
| |
* | multi-decrypt: working recyclerview which decrypt files sequentially, ui in ↵Vincent Breitmoser2015-06-022-0/+233
| | | | | | | | progress
* | multi-decrypt: first steps, split up DecryptFilesFragmentVincent Breitmoser2015-06-012-129/+114
| |
* | introduce CachingDataDecryptorFactory towards cached session keysVincent Breitmoser2015-06-011-0/+0
|/ | | | | | | | this commit introduces the CachingDataDecryptorFactory, which wraps a DataDecryptorFactory but supports caching of decrypted session keys. this change also gets rid of runtimeexception based control flow in PgpDecryptVerify.
* prevent NaN dialog on import with no selected keysAdithya Abraham Philip2015-05-311-0/+1
|
* better error handling for bad encrypted data checksumVincent Breitmoser2015-05-301-0/+1
|
* show status indicators in EncryptFragmentVincent Breitmoser2015-05-303-17/+96
|
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-281-2/+1
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml
| * preserve state in DecryptTextActivityVincent Breitmoser2015-05-281-2/+1
| |
| * fix merge problems (derp)Vincent Breitmoser2015-05-281-16/+0
| |
| * warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+1
| |
| * don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-288-8/+8
| | | | | | | | PgpDecryptVerify changes
| * correctly preserve state in EncryptFilesFragmentVincent Breitmoser2015-05-281-2/+0
| |
| * move synchronous encryption into activity, and preserve checkbox stateVincent Breitmoser2015-05-283-10/+9
| |
| * Improve stringsDominik Schürmann2015-05-282-28/+45
| |
| * Fix language based on feedback from transifexDominik Schürmann2015-05-211-1/+1
| |
| * check fingerprint length after scanning qr codeVincent Breitmoser2015-05-171-1/+2
| | | | | | | | Fixes #1281
| * apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-171-0/+3
| |
* | warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+1
| |
* | don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-288-8/+8
| | | | | | | | PgpDecryptVerify changes