aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Expand)AuthorAgeFilesLines
* OTG: Implement hidden activity usb detection techniqueNikita Mikhailov2016-04-142-8/+53
* OTG: Rename 'javacard' package, methods, remove JavacardInterfaceNikita Mikhailov2016-04-145-55/+53
* OTG: Usb device manager fixesNikita Mikhailov2016-04-141-3/+9
* OTG: Add usb device manager prototypeNikita Mikhailov2016-04-141-28/+68
* OTG: update methodsNikita Mikhailov2016-04-145-623/+51
* Revert usage of masked-edittext, back to plain edittexts for backup codesDominik Schürmann2016-04-122-118/+177
* Merge pull request #1772 from runnerway/importkey-encryptedVincent2016-04-122-10/+108
|\
| * Handle encrypted files while importing keysAndrea Torlaschi2016-03-272-10/+108
* | Use cert pinning only if availableDominik Schürmann2016-04-091-2/+2
* | Okhttp3 cleanups, docs, and fix timeouts for default clientDominik Schürmann2016-04-091-1/+1
* | KeyBaseLib response ClientMichal Kepkowski2016-04-081-1/+1
* | Merge branch 'master' into okhttp3Michal Kepkowski2016-04-0620-578/+608
|\ \
| * \ Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbarVincent2016-04-061-0/+3
| |\ \
| | * | Used a constant instead of magic number for colourVictor Hazali2016-04-041-1/+2
| | * | Fixes #1298Victor Hazali2016-03-301-0/+2
| | |/
| * | Fix Unusable signing key not properly disabled, Issue #1468Durgesh2016-04-052-10/+0
| * | Merge pull request #1808 from vhazali/warn-when-stripping-master-keyVincent2016-04-041-5/+28
| |\ \
| | * | setTitle now uses resource id directlyVictor Hazali2016-04-011-1/+1
| | * | Refactored switch statements to use constantsVictor Hazali2016-03-301-5/+9
| | * | Extracted methodVictor Hazali2016-03-301-16/+20
| | * | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into warn-when-stripp...Victor Hazali2016-03-301-1/+16
| | |\ \ | | | |/ | | |/|
| | | * Alert for Stripping Subkeys.tdjogi010@gmail.com2016-03-021-1/+16
| * | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-045-351/+263
| |\ \ \
| | * | | Redesigned subkey creation dialog and changed default key type created to RSA...Alex Fong2016-04-015-351/+263
| * | | | Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-316-21/+39
| * | | | Display Key moved to FragmentDurgesh2016-03-293-171/+224
| | |/ / | |/| |
| * | | change sync interval on change in codeAdithya Abraham Philip2016-03-241-4/+12
| * | | Merge pull request #1785 from advaita13/wifi-only-fixVincent2016-03-241-3/+3
| |\ \ \
| | * | | Final commitAdvaita2016-03-231-3/+3
| | |/ /
| * | | Merge pull request #1782 from fiaxh/share_key_mimeDominik Schürmann2016-03-241-1/+1
| |\ \ \
| | * | | Set MIME application/pgp-keys when sending a keyfiaxh2016-03-141-1/+1
| | |/ /
| * | | use new TokenAutoComplete 2.0.7, fixes #1636Vincent Breitmoser2016-03-232-11/+0
| * | | get rid of code path for pin and notation data handlingVincent Breitmoser2016-03-233-6/+4
| * | | Fix CertifyKeyActivity back button on action bar not working #1758Durgesh2016-03-221-0/+11
| |/ /
| * | Merge pull request #1780 from AlexFJW/backup-code-selectionDominik Schürmann2016-03-121-0/+25
| |\ \
| | * | Provisional backup-code text selection fixAlex Fong2016-03-121-0/+25
* | | | okhttp3Michal Kepkowski2016-03-141-10/+5
|/ / /
* / / Fix display of keyserver item in dark themefiaxh2016-03-101-3/+4
|/ /
* | Fix NullPointerException in ImportKeysListFragment.checkAndRequestReadPermiss...Durgesh2016-03-081-1/+1
* | Open keyboard for backup codeDominik Schürmann2016-03-081-22/+31
* | Revert "Use non-breaking spaces for backup code MaskedEditText"Dominik Schürmann2016-03-081-7/+2
* | Fix code style and documentation in BaseSecurityTokenNfcActivityDominik Schürmann2016-03-082-40/+45
* | Fix documentation of nfcGenerateOnCardKeyDominik Schürmann2016-03-081-3/+1
* | Fix comment in nfcGenerateOnCardKeyDominik Schürmann2016-03-081-1/+1
* | Add nfcGenerateOnCardKey by Joey Castillo before it gets lostDominik Schürmann2016-03-081-0/+42
* | Merge pull request #1747 from runnerway/fix-alreadyaddedDominik Schürmann2016-03-061-2/+2
|\ \
| * | Remove uri from pending even when already addedAndrea Torlaschi2016-03-041-2/+2
* | | Merge pull request #1750 from 007durgesh219/Issue#1746Dominik Schürmann2016-03-051-1/+1
|\ \ \
| * | | Fix Dark theme no longer works in main screen on android 5, Issue#1746Durgesh2016-03-051-1/+1
| |/ /
* / / Always check read permissionAndrea Torlaschi2016-03-021-1/+8
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 02:23:46 +0000