aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* Removed unrequired code, standardized terms used.Alex Fong2016-05-051-1/+1
|
* (WIP) Change password when key is stripped #1692Alex Fong2016-05-041-0/+2
| | | | | | | | | | | 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 error codes for ykneo-openpgp 1.0.11Dominik Schürmann2016-04-301-3/+3
|
* 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
|
* Merge pull request #1819 from 007durgesh219/Issue#1817Dominik Schürmann2016-04-291-0/+1
|\ | | | | Fix Crash when no encryption subkey is available, Issue #1817
| * Fix Crash when no encryption subkey is available, Issue #1817Durgesh2016-04-141-0/+1
| | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | Use proper ImportKeysProxyActivity to scan QR CodesDominik Schürmann2016-04-291-2/+2
| |
* | Merge branch 'master' of https://github.com/LuboViluda/open-keychain into ↵Dominik Schürmann2016-04-291-0/+5
|\ \ | | | | | | | | | LuboViluda-master
| * | unnecesary code removedLubo Viluda2016-04-121-6/+0
| | | | | | | | | | | | | | | - setContentView removed - R.layout.redirect_import_keys_activity.xml removed
| * | Unnecesary code removed and string repairedLubo Viluda2016-04-123-10/+3
| | | | | | | | | | | | | | | | | | | | | - Unnecesary import from RedirectImportKeyActivity.java removed - ..\value-w820dp\dimens.xml was unnecesary - \..value\dimens.xml unnecasary line - string sources repaired
| * | upgrade of Redirect import activityLubo Viluda2016-03-243-74/+8
| | | | | | | | | | | | | | | | | | | | | -> RedirectImportActivity is transparent now -> some poinlessly data removed -> String moved into sources -> xml for activity simplified
| * | #1661 - Don't expose CertifyActivityLubo Viluda2016-03-204-0/+84
| | | | | | | | | | | | | | | | | | | | | *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-291-7/+7
| | |
* | | Merge branch 'Issue#925' of https://github.com/007durgesh219/open-keychain ↵Dominik Schürmann2016-04-291-1/+9
|\ \ \ | | | | | | | | | | | | into 007durgesh219-Issue#925
| * | | Add + button besides TokenAutoComplete, Issue #925Durgesh2016-04-141-1/+9
| | |/ | |/| | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | Merge pull request #1831 from fiaxh/key_creation_flexibleDominik Schürmann2016-04-292-2/+7
|\ \ \ | | | | | | | | Handle user input on key creation more generously
| * | | Handle user input on key creation more generouslyfiaxh2016-04-152-2/+7
| | | | | | | | | | | | | | | | | | | | Allow empty name and do not regex-check email fixes #1825
* | | | New translations from transifexDominik Schürmann2016-04-2960-660/+2222
| | | |
* | | | Fix stringsDominik Schürmann2016-04-181-2/+2
| | | |
* | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2016-04-181-0/+1
|\ \ \ \
| * \ \ \ Merge pull request #1835 from nmikhailov/check_security_tokenDominik Schürmann2016-04-161-0/+1
| |\ \ \ \ | | | | | | | | | | | | Check security token
| | * | | | Check if security token keys match required once before signing/decryptionNikita Mikhailov2016-04-161-0/+1
| | | | | |
* | | | | | Fix delete_failDominik Schürmann2016-04-181-1/+1
|/ / / / /
* / / / / Fix stringDominik Schürmann2016-04-161-1/+1
|/ / / /
* | | | OTG: Implement hidden activity usb detection techniqueNikita Mikhailov2016-04-141-1/+24
| | | |
* | | | OTG: Add usb device manager prototypeNikita Mikhailov2016-04-141-0/+4
| |/ / |/| |
* | | Fix stringDominik Schürmann2016-04-131-1/+1
| | |
* | | Merge branch 'backup-code'Dominik Schürmann2016-04-126-69/+1428
|\ \ \
| * | | Fix in-app help for backup codesDominik Schürmann2016-04-121-1/+1
| | | |
| * | | Revert usage of masked-edittext, back to plain edittexts for backup codesDominik Schürmann2016-04-125-68/+1427
| | | |
* | | | Fix stringsDominik Schürmann2016-04-121-3/+3
|/ / /
* | | Merge pull request #1772 from runnerway/importkey-encryptedVincent2016-04-121-0/+1
|\ \ \ | | | | | | | | Handle encrypted files in "import key" file selection
| * | | Handle encrypted files while importing keysAndrea Torlaschi2016-03-271-0/+1
| | | |
* | | | Add missing keyholder string paramNikita Mikhailov2016-04-111-1/+1
| |/ / |/| |
* | | Merge pull request #1804 from vhazali/tint-linked-contact-picture-in-toolbarVincent2016-04-061-0/+1
|\ \ \ | | | | | | | | tint linked contact picture in toolbar #1298
| * | | Used a constant instead of magic number for colourVictor Hazali2016-04-041-0/+1
| |/ / | | | | | | | | | Explicitly stated the blending mode
* | | Merge pull request #1808 from vhazali/warn-when-stripping-master-keyVincent2016-04-041-0/+3
|\ \ \ | | | | | | | | Warn when stripping master key #1554
| * | | Corrected warning messageVictor Hazali2016-04-011-1/+1
| | | |
| * | | Corrected capitalisation of subkeyVictor Hazali2016-03-301-2/+2
| | | |
| * | | Merge commit '05accb49066a2693cfc1c92e29ad10112f957495' into ↵Victor Hazali2016-03-301-0/+3
| |\ \ \ | | |/ / | |/| | | | | | warn-when-stripping-master-key
| | * | Alert for Stripping Subkeys.tdjogi010@gmail.com2016-03-021-0/+3
| | | |
* | | | Merge pull request #1796 from AlexFJW/LimitCreateKeyOptionsVincent2016-04-048-133/+91
|\ \ \ \ | | | | | | | | | | Refer to issue #1600 Limit create key options
| * | | | Redesigned subkey creation dialog and changed default key type created to ↵Alex Fong2016-04-018-133/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RSA, 3072 bit. Added code to prevent removal of master subkey when modifying a new key.
* | | | | Fix Display Key in UploadKeyActivity, Issue #506Durgesh2016-03-312-2/+6
| | | | |
* | | | | Display Key moved to FragmentDurgesh2016-03-292-2/+9
| |/ / / |/| | | | | | | | | | | Signed-off-by: Durgesh <007durgesh219@gmail.com>
* | | | Final commitAdvaita2016-03-232-0/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All changes included Improvements -Reformatted code wherever required -Only active wifi connections trigger events -Improve sync reliability -Removed extra permission Minor Changes -Refactored 2 variables for easier readbility -Wifi-Only-Sync is now enabled by default
* | | Make it a style to reduce code duplicationDominik Schürmann2016-03-086-148/+25
| | |
* | | Add more responsive text sizesDominik Schürmann2016-03-082-1/+74
| | |
* | | Using new size qualifiersDominik Schürmann2016-03-084-3/+74
| | |