aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into backup-apiDominik Schürmann2016-05-07272-4349/+12274
|\ | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib
| * Merge pull request #1855 from AlexFJW/ImportKeyFixDominik Schürmann2016-05-071-0/+1
| |\ | | | | | | Fixes bug for #1854
| | * A simple fix to clear the list of detected keys when parsing key file gives ↵Alex Fong2016-05-071-0/+1
| |/ | | | | | | an error.
| * external-provider: only allow permission check for caller package namesVincent Breitmoser2016-05-062-36/+47
| |
| * Version 3.9.6 betaDominik Schürmann2016-05-051-2/+2
| |
| * Merge branch 'AlexFJW-StrippedChangePass'Dominik Schürmann2016-05-0519-105/+358
| |\
| | * Fix formattingDominik Schürmann2016-05-052-4/+4
| | |
| | * Revert "Added warning dialog for importing keys"Dominik Schürmann2016-05-052-29/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 9d35dcb0e924a7f8afcfcaa86752efb40799a456. Conflicts: OpenKeychain/src/main/res/values/strings.xml
| | * Slight amendments for clarityAlex Fong2016-05-053-2/+5
| | |
| | * Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcelAlex Fong2016-05-0512-28/+38
| | |
| | * Added license to ChangeUnlockOperationAlex Fong2016-05-051-0/+17
| | |
| | * Edited commentsAlex Fong2016-05-051-2/+2
| | |
| | * Fixed warnings encounteredAlex Fong2016-05-052-2/+1
| | |
| | * Added warning dialog for importing keysAlex Fong2016-05-052-0/+29
| | |
| | * Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵Alex Fong2016-05-0517-206/+173
| | | | | | | | | | | | into ChangeUnlockParcel.
| | * Removed unrequired code, standardized terms used.Alex Fong2016-05-053-32/+15
| | |
| | * Refactored code to use functions already present in code, reduced liberties ↵Alex Fong2016-05-052-28/+29
| | | | | | | | | | | | | | | | | | | | | taken when modifying functions. Todo: Fix indentation for error messages
| | * (WIP) Change password when key is stripped #1692Alex Fong2016-05-0420-73/+346
| |/ | | | | | | | | | | | | | | | | | | | | 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.
| * api: add a comment explaining use of wrapperBundleVincent Breitmoser2016-05-041-0/+1
| |
| * api: ACTION_GET_KEY selects by any subkey, rather than just master key idVincent Breitmoser2016-05-041-1/+2
| |
| * Merge pull request #1850 from nmikhailov/masterDominik Schürmann2016-05-011-2/+2
| |\ | | | | | | Fix rotation crash in CreateSecurityTokenWaitFragment #1849
| | * Fix rotation crash in CreateSecurityTokenWaitFragmentNikita Mikhailov2016-05-011-2/+2
| |/
| * Fix error codes for ykneo-openpgp 1.0.11Dominik Schürmann2016-04-302-27/+52
| |
| * Remove lefover commentDominik Schürmann2016-04-301-1/+1
| |
| * Fix animation in manage keys for security tokensDominik Schürmann2016-04-309-30/+47
| |
| * Improve security_token_error_iso_dep_not_supportedDominik Schürmann2016-04-301-1/+1
| |
| * Fix german title from transifexDominik Schürmann2016-04-301-1/+1
| |
| * Fix createUserIdDominik Schürmann2016-04-291-1/+1
| |
| * Merge pull request #1819 from 007durgesh219/Issue#1817Dominik Schürmann2016-04-297-24/+32
| |\ | | | | | | Fix Crash when no encryption subkey is available, Issue #1817
| | * Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-147-24/+32
| | | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| * | Merge branch 'LuboViluda-master'Dominik Schürmann2016-04-293-4/+76
| |\ \
| | * | Use proper ImportKeysProxyActivity to scan QR CodesDominik Schürmann2016-04-292-7/+8
| | | |
| | * | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵Dominik Schürmann2016-04-293-4/+75
| |/| | | | | | | | | | | | | | LuboViluda-master
| | * | unnecesary code removedLubo Viluda2016-04-122-7/+0
| | | | | | | | | | | | | | | | | | | | - setContentView removed - R.layout.redirect_import_keys_activity.xml removed
| | * | Unnecesary code removed and string repairedLubo Viluda2016-04-124-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-242-2/+1
| | | | | | | | | | | | | | | | Theme.Keychain.Transparet is used
| | * | upgrade of Redirect import activityLubo Viluda2016-03-245-98/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified
| | * | #1661 - Don't expose CertifyActivityLubo Viluda2016-03-206-5/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | *Add new activity - RedirectImportKeysActivity, which prompts user to use Openkeychain directly *Add intent filter for the activity *Change intent filter for CertifyActivity
| * | | Use StringBuilder.append() according to lintDominik Schürmann2016-04-291-2/+6
| | | |
| * | | Re-enable move-to-card option, improve stringsDominik Schürmann2016-04-295-96/+88
| | | |
| * | | Merge branch '007durgesh219-Issue#925'Dominik Schürmann2016-04-293-1/+36
| |\ \ \
| | * | | 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-293-1/+36
| |/| | | | | | | | | | | | | | | | | | into 007durgesh219-Issue#925
| | * | | Add + button besides TokenAutoComplete, Issue #925Durgesh2016-04-143-1/+36
| | | |/ | | |/| | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
| * | | Merge pull request #1816 from fiaxh/no_name_choose_emailDominik Schürmann2016-04-294-9/+49
| |\ \ \ | | | | | | | | | | Correctly handle keys only having an email address
| | * | | Better handle user_id sidecases while splittingfiaxh2016-04-123-5/+45
| | | | |
| | * | | Use email field to match email in KeychainProviderfiaxh2016-04-121-4/+4
| | | | | | | | | | | | | | | | | | | | fixes #1699
| * | | | Merge pull request #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-297-85/+67
| |\ \ \ \ | | | | | | | | | | | | Handle user input on key creation more generously
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 15:55:07 +0000