aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-081-0/+1
| |
* | Rename advanced to extendedDominik Schürmann2015-03-311-7/+7
| |
* | From passphrase to passwordDominik Schürmann2015-03-311-47/+47
| |
* | Simplify passphrase dialog designDominik Schürmann2015-03-312-2/+1
| |
* | Merge branch 'v/crypto-input-parcel' of ↵Vincent Breitmoser2015-03-303-63/+60
|\ \ | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
| * | Fix scrollbarDominik Schürmann2015-03-301-0/+1
| | |
| * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-303-63/+59
| | |
* | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-1/+0
|/ /
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-303-13/+23
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
| * rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-303-13/+23
| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
* | Fix strings with email addressDominik Schürmann2015-03-291-2/+2
| |
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-0/+1
|\|
| * -Fixed a situation where additional emails could be duplicated when creating ↵Daniel Ramos2015-03-271-0/+1
| | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations.
* | Fixing crashes with new encrypt uiDominik Schürmann2015-03-293-2/+1
| |
* | Refactoring of EncryptTextActivityDominik Schürmann2015-03-271-4/+3
| |
* | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-263-10/+8
| |
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-24191-7866/+9358
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * 3.2beta3Dominik Schürmann2015-03-231-1/+1
| |
| * translation fixesDominik Schürmann2015-03-238-113/+93
| |
| * Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-234-11/+16
| |
| * Pull from transifexDominik Schürmann2015-03-23110-199/+8849
| |
| * Remove remaining html entities in changelogDominik Schürmann2015-03-231-3/+3
| |
| * introduced multi-threadingAdithya Abraham Philip2015-03-232-0/+7
| | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
| * Markdown commentsDominik Schürmann2015-03-235-5/+5
| |
| * Remove changelog in main folder, update commentsDominik Schürmann2015-03-234-0/+4
| |
| * Use markdown for in-app helpDominik Schürmann2015-03-2378-7635/+481
| |
* | further improve yubikey error handlingVincent Breitmoser2015-03-231-0/+1
| |
* | nicer handling of nfc errorsVincent Breitmoser2015-03-231-0/+1
| |
* | enable nfc in import dialog as wellVincent Breitmoser2015-03-221-1/+2
| |
* | finish ui flow for yubikey importVincent Breitmoser2015-03-222-23/+66
| |
* | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-1/+3
| |
* | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-222-3/+12
| |
* | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-223-70/+117
| |
* | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-2111-19/+88
| |
* | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-16/+85
| |
* | first steps toward yubikey activityVincent Breitmoser2015-03-212-17/+100
| | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-5/+15
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-5/+15
| |
* | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+1
| |
* | fix unit tests (for real)Vincent Breitmoser2015-03-201-2/+4
| |
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2029-164/+152
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
| * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-206-4/+21
| | | | | | | | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
| * Manage my keys wizardDominik Schürmann2015-03-1923-160/+131
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-1/+2
| |
* | yubikey certifications!Vincent Breitmoser2015-03-181-1/+1
|/
* Disable hidden recipients for nowDominik Schürmann2015-03-162-10/+10
|
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-163-2/+16
|
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-163-5/+17
|
* Clarify certification help screenDominik Schürmann2015-03-161-2/+2
|
* Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-151-0/+22
|