aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* fix encrypt activity layoutVincent Breitmoser2015-04-241-2/+1
* revamp decrypt uiVincent Breitmoser2015-04-243-149/+347
* don't show key spinner for a single entryVincent Breitmoser2015-04-242-1/+10
* use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-244-76/+30
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2452-2299/+2855
|\
| * Use portrait mode for qr code scanningDominik Schürmann2015-04-151-10/+8
| * More cleanupDominik Schürmann2015-04-159-324/+28
| * Fix YubiKey naming, cleanupDominik Schürmann2015-04-157-53/+45
| * Clean up NfcOperationActivityDominik Schürmann2015-04-151-8/+6
| * Reformat nfcVerifyPINDominik Schürmann2015-04-151-6/+6
| * Consolidate PIN verify operation in nfcVerifyPIN method.Joey Castillo2015-04-141-44/+28
| * Move PIN verify inside sign/decrypt operation and set correct mode.Joey Castillo2015-04-141-19/+45
| * Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-131-21/+85
| |\
| | * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-081-9/+23
| | * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-081-20/+70
| * | IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-132-8/+4
| * | Cache CryptoInputParcel in OpenPgpServiceDominik Schürmann2015-04-102-8/+10
| * | Fix nullpointer with Intent API, fix clearing of encrypt file list, notify wh...Dominik Schürmann2015-04-042-6/+7
| * | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-015-105/+25
| * | Prepare decrypt UI for input parcelDominik Schürmann2015-03-312-124/+58
| * | Better check if file is already addedDominik Schürmann2015-03-311-19/+42
| * | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Dominik Schürmann2015-03-313-2/+16
| |\ \
| | * | work on passphrase data flowVincent Breitmoser2015-03-313-2/+16
| * | | Simplify passphrase dialog designDominik Schürmann2015-03-311-2/+3
| |/ /
| * | Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychai...Vincent Breitmoser2015-03-306-120/+332
| |\ \
| | * | Dont show slinger button in spinnerDominik Schürmann2015-03-301-0/+2
| | * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-305-121/+331
| * | | remove unused NfcActivityVincent Breitmoser2015-03-302-574/+5
| * | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-3011-281/+48
| * | | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-303-15/+8
| |/ /
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-304-392/+400
| |\|
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-291-12/+36
| |\ \
| * | | Fixing crashes with new encrypt uiDominik Schürmann2015-03-293-32/+49
| * | | Start reworking decrypt ui classesDominik Schürmann2015-03-273-172/+197
| * | | Refactoring of EncryptTextActivityDominik Schürmann2015-03-278-400/+415
| * | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-261-14/+76
| |\ \ \
| * | | | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-266-506/+531
| * | | | Fix certify with CryptoInputParcelDominik Schürmann2015-03-253-10/+6
| * | | | Remove backward compat in CertifyKeyFragmentDominik Schürmann2015-03-251-17/+1
| * | | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-2424-142/+299
| |\ \ \ \
| * | | | | further improve yubikey error handlingVincent Breitmoser2015-03-232-18/+39
| * | | | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-5/+8
| * | | | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-221-14/+23
| |\ \ \ \ \
| * | | | | | enable nfc in import dialog as wellVincent Breitmoser2015-03-223-5/+49
| * | | | | | finish ui flow for yubikey importVincent Breitmoser2015-03-226-197/+329
| * | | | | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-8/+9
| * | | | | | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-221-11/+102
| * | | | | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-226-158/+259
| * | | | | | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-214-64/+137
| * | | | | | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-213-18/+270