aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
* Changed HashMap to ArrayList<Pair>Alex Fong2016-05-191-13/+13
|
* Removed * importAlex Fong2016-05-191-1/+3
|
* Added passphrase check for stripped masterkeysAlex Fong2016-05-191-18/+57
|
* make unencrypted backup an explicit parameterVincent Breitmoser2016-05-171-1/+1
|
* Merge pull request #1870 from AlexFJW/RemovedDuplicateCodeVincent2016-05-1719-24/+43
|\ | | | | Shifted duplicate method implementations from KeyRing to openpgp-api …
| * Shifted duplicate method implementations from KeyRing to openpgp-api submoduleAlex Fong2016-05-1519-24/+43
| |
* | Settings: remove unuseful initializationAndrea Torlaschi2016-05-171-14/+0
| |
* | Settings: change CheckBoxPreference to SwitchPreferenceAndrea Torlaschi2016-05-171-3/+2
|/
* Revert "Add + button besides TokenAutoComplete, Issue #925"Dominik Schürmann2016-05-122-27/+0
| | | | | | | This reverts commit 72d2a627ff7641a660628ed5d634209a93efebd2. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
* update progress handling in PgpDecryptVerifyOperationVincent Breitmoser2016-05-111-1/+6
| | | | | | | | - less progress messages overall - report progress again based on input stream position, if filesize is known - limit progress messages to one every 200ms while decrypting - also fixed a bug in DecryptListFragment, the recycler view now reuses old views as intended instead of crossfading all the time.
* PgpSignEncryptOperation refactoringAndrea Torlaschi2016-05-102-7/+14
|
* Merge branch 'master' into backup-apiDominik Schürmann2016-05-0745-2119/+1927
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib
| * A simple fix to clear the list of detected keys when parsing key file gives ↵Alex Fong2016-05-071-0/+1
| | | | | | | | an error.
| * Fix formattingDominik Schürmann2016-05-052-4/+4
| |
| * Revert "Added warning dialog for importing keys"Dominik Schürmann2016-05-051-27/+0
| | | | | | | | | | | | | | This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456. Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * Slight amendments for clarityAlex Fong2016-05-052-1/+4
| |
| * Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcelAlex Fong2016-05-052-4/+6
| |
| * Fixed warnings encounteredAlex Fong2016-05-052-2/+1
| |
| * Added warning dialog for importing keysAlex Fong2016-05-051-0/+27
| |
| * Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵Alex Fong2016-05-053-20/+15
| | | | | | | | into ChangeUnlockParcel.
| * (WIP) Change password when key is stripped #1692Alex Fong2016-05-043-10/+12
| | | | | | | | | | | | | | | | | | | | | | Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead.
| * Fix rotation crash in CreateSecurityTokenWaitFragmentNikita Mikhailov2016-05-011-2/+2
| |
| * Fix error codes for ykneo-openpgp 1.0.11Dominik Schürmann2016-04-301-24/+49
| |
| * Remove lefover commentDominik Schürmann2016-04-301-1/+1
| |
| * Fix animation in manage keys for security tokensDominik Schürmann2016-04-306-24/+42
| |
| * Merge pull request #1819 from 007durgesh219/Issue#1817Dominik Schürmann2016-04-292-0/+11
| |\ | | | | | | Fix Crash when no encryption subkey is available, Issue #1817
| | * Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-142-0/+11
| | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| * | Use proper ImportKeysProxyActivity to scan QR CodesDominik Schürmann2016-04-291-5/+6
| | |
| * | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵Dominik Schürmann2016-04-291-0/+58
| |\ \ | | | | | | | | | | | | LuboViluda-master
| | * | unnecesary code removedLubo Viluda2016-04-121-1/+0
| | | | | | | | | | | | | | | | | | | | - setContentView removed - R.layout.redirect_import_keys_activity.xml removed
| | * | Unnecesary code removed and string repairedLubo Viluda2016-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Unnecesary import from RedirectImportKeyActivity.java removed - ..\value-w820dp\dimens.xml was unnecesary - \..value\dimens.xml unnecasary line - string sources repaired
| | * | Activity renamedLubo Viluda2016-04-041-2/+2
| | | | | | | | | | | | | | | | Activity renamed from startScanActivity to startQrCodeCaptureActivity
| | * | Changed activity during RedirectKeysActivityLubo Viluda2016-04-041-6/+1
| | | | | | | | | | | | | | | | QrCodeCaptureActivity is open instead ImportKeysActivity
| | * | Theme changeLubo Viluda2016-03-241-1/+0
| | | | | | | | | | | | | | | | Theme.Keychain.Transparet is used
| | * | upgrade of Redirect import activityLubo Viluda2016-03-241-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified
| | * | #1661 - Don't expose CertifyActivityLubo Viluda2016-03-201-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | *Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly *Add intent filter for the activity *Change intent filter for CertifyActivity
| * | | Re-enable move-to-card option, improve stringsDominik Schürmann2016-04-294-89/+81
| | | |
| * | | Include only add button in dropdown widthDominik Schürmann2016-04-291-2/+2
| | | |
| * | | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain ↵Dominik Schürmann2016-04-292-0/+27
| |\ \ \ | | | | | | | | | | | | | | | into 007durgesh219-Issue#925
| | * | | Add + button besides TokenAutoComplete, Issue #925Durgesh2016-04-142-0/+27
| | | |/ | | |/| | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| * | | Merge pull request #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-294-75/+50
| |\ \ \ | | | | | | | | | | Handle user input on key creation more generously
| | * | | Handle user input on key creation more generouslyfiaxh2016-04-154-75/+50
| | | | | | | | | | | | | | | | | | | | | | | | | Allow empty name and do not regex-check email fixes #1825
| * | | | Merge pull request #1832 from 007durgesh219/WrongCachedFileEncryptDominik Schürmann2016-04-291-0/+2
| |\ \ \ \ | | | | | | | | | | | | Fix Wrong file encrypted from cached input
| | * | | | Fix Wrong file encrypted from cached inputDurgesh2016-04-151-0/+2
| | | |/ / | | |/| | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| * | | | Update libraries, add proguard filters to be under 64K limitDominik Schürmann2016-04-291-1/+2
| | | | |
| * | | | Check subkey id instead of masterkey id on security token operationsNikita Mikhailov2016-04-161-4/+4
| | | | | | | | | | | | | | | | | | | | Rename ambiguous getMasterKeyFingerprint -> getKeyFingerprint
| * | | | Check if security token keys match required once before signing/decryptionNikita Mikhailov2016-04-161-0/+16
| | | | |
| * | | | Update obsolete Nfc class prefixesNikita Mikhailov2016-04-161-1/+1
| | | | |
| * | | | OTG: Rename smartcard -> security tokenNikita Mikhailov2016-04-153-17/+17
| | | | |
| * | | | OTG: Skip TokenWaitFragmen when otg device is connectedNikita Mikhailov2016-04-153-11/+27
| | | | |