aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog
Commit message (Collapse)AuthorAgeFilesLines
* ensuring code style is preservedAdithya Abraham Philip2015-07-034-13/+16
|
* added proxy support to keyserver verificationAdithya Abraham Philip2015-07-031-1/+1
|
* orbot dialog fragments addedAdithya Abraham Philip2015-07-033-0/+385
|
* added placeholder proxy to AddKeyServerAdithya Abraham Philip2015-07-031-5/+22
|
* Disable move to card from edit screenDominik Schürmann2015-07-021-2/+2
|
* reworked keyserver preferences with recyclerviewAdithya Abraham Philip2015-07-021-12/+77
|
* changed to work with multi-decryptAdithya Abraham Philip2015-06-271-0/+5
|
* fixed package importAdithya Abraham Philip2015-06-271-1/+1
|
* renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-271-3/+3
|
* deleted KeychainServiceAdithya Abraham Philip2015-06-272-6/+3
|
* migrated delete op to KeychainNewServiceAdithya Abraham Philip2015-06-271-42/+65
|
* fix rest of resource leaks (#1351)Vincent Breitmoser2015-06-171-32/+22
|
* backport CryptoOperationFragment changes without eventbusVincent Breitmoser2015-06-101-7/+3
|
* Partially revert "switch to native DialogFragment, fix some nullpointers", ↵Vincent Breitmoser2015-06-031-1/+2
| | | | | | | | | but keep nullpointer fixes This reverts commit 403f74f55830dcc5eaa027ccebb888a1122992d1. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
* renamed KeychainIntentService to KeychainServiceAdithya Abraham Philip2015-06-012-12/+12
|
* merged servicesAdithya Abraham Philip2015-06-012-30/+7
|
* switch to native DialogFragment, fix some nullpointersVincent Breitmoser2015-05-311-18/+24
|
* Improve stringsDominik Schürmann2015-05-191-5/+2
|
* Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-121-0/+4
|
* 3.2.1Dominik Schürmann2015-05-101-1/+1
|
* Fixing rotate crashes in create keyDominik Schürmann2015-05-101-4/+4
|
* Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-241-3/+5
|\ | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
| * -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-141-3/+5
| | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment.
* | keyserver verification on additionAdithya Abraham Philip2015-04-221-0/+320
|/
* Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-301-4/+17
|
* Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-242-9/+46
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| * shifted multi-threading to own serviceAdithya Abraham Philip2015-03-232-9/+46
| | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
* | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-1/+1
|\| | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * Reworked Notify classManoj Khanna2015-03-201-1/+1
| |
* | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-201-6/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-191-10/+11
| |
* | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-11/+1
|/
* object oriented split user idDominik Schürmann2015-03-162-5/+5
|
* Clarify logs in DeleteFileDialogDominik Schürmann2015-03-121-2/+2
|
* Merge pull request #1117 from danielnelz/developmentDominik Schürmann2015-03-121-1/+1
|\ | | | | #1042: Replaced ints with enums
| * Merge remote-tracking branch 'upstream/development' into developmentdanielnelz2015-03-091-22/+27
| |\
| * | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-091-1/+1
| | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* | | Improve file deletion stringsDominik Schürmann2015-03-121-3/+3
| | |
* | | Updated fix for Issue #1116Manoj Khanna2015-03-111-33/+71
| | |
* | | Add additional email addresses in create keyDominik Schürmann2015-03-101-0/+215
| |/ |/|
* | Some fixes for delete after encryptionDominik Schürmann2015-03-091-22/+27
|/
* Implemented NameEditTextchipset952015-03-091-22/+3
|
* minor code style correctionAdithya Abraham Philip2015-03-071-1/+7
|
* cleaned up codeAdithya Abraham Philip2015-03-061-9/+1
|
* added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-061-5/+3
|
* Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-062-35/+11
|
* Simplify dialogs according to Material DesignDominik Schürmann2015-03-042-13/+9
|
* Show name only in passphrase dialogDominik Schürmann2015-03-031-0/+17
|
* Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-033-44/+47
|
* Remove old min sdk checkDominik Schürmann2015-03-031-3/+1
|