aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-252-1/+31
|
* Merge pull request #476 from thi/rename-old-apg-thingsDominik Schürmann2014-03-2311-23/+23
|\ | | | | Rename old mentionings of APG-named things
| * Rename old mentionings of APG-named thingsThialfihar2014-03-2311-23/+23
|/ | | | | Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs
* Merge pull request #473 from thi/masterDominik Schürmann2014-03-2322-122/+55
|\ | | | | Adjust credits, align signature in encrypt layout slightly, fix file decryption, remove icon set credits
| * Update README.md, icon set not used anymoreThialfihar2014-03-231-34/+30
| |
| * Remove icon set creditsThialfihar2014-03-2319-38/+0
| |
| * Fix file decryption interfaceThialfihar2014-03-231-10/+3
| | | | | | | | | | | | Actually use mAssumeSymmetricEncryption and set it to false as default. Don't close the file input stream, so we can actually look for PGP encrypted data in the next step.
| * Adjust encrypt layout, align signature with buttonThialfihar2014-03-231-2/+3
| |
| * Adjust creditsThialfihar2014-03-2319-38/+19
|/
* Merge pull request #469 from honnel/save-key-workaroundDominik Schürmann2014-03-231-1/+9
|\ | | | | Can't save key after key generation
| * Merge branch 'save-key-workaround' of ↵Daniel Hammann2014-03-220-0/+0
| |\ | | | | | | | | | | | | | | | | | | https://github.com/honnel/openpgp-keychain into save-key-workaround Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| | * The current implementation of saving new generated key doesn't save the key ↵Daniel Hammann2014-03-221-1/+8
| | | | | | | | | | | | due to the public key of master key id can not be resolved by ProviderHelper.getPGPPublicKeyByKeyId (via URI/Cursor). Workaround uses local keys-arraylist for resoving the pubkey of master key id.
| * | The current implementation of saving new generated key doesn't save the key ↵Daniel Hammann2014-03-221-1/+9
| |/ | | | | | | due to the public key of master key id can not be resolved by ProviderHelper.getPGPPublicKeyByKeyId (via URI/Cursor). Workaround uses local keys-arraylist for resoving the pubkey of master key id.
* | Use new FoldableLinearLayout in API settingsDominik Schürmann2014-03-232-59/+15
| |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-227-150/+336
|\ \
| * \ Merge pull request #467 from uberspot/masterDominik Schürmann2014-03-226-140/+329
| |\ \ | | | | | | | | Make foldable settings in EncryptActivity into a separate widget
| | * | Make foldable settings in EncryptActivity a separate widgetuberspot2014-03-216-140/+329
| | |/
| * | Merge pull request #468 from honnel/ui-createkeyDominik Schürmann2014-03-221-10/+7
| |\ \ | | |/ | |/| Because of an unknown reason toast messages were commented out.
| | * Because of an unknown reason toast messages were commented out.Daniel Hammann2014-03-211-10/+7
| |/
* / raname to mKeychainDatabaseDominik Schürmann2014-03-211-6/+6
|/
* Fix nfc help buttonDominik Schürmann2014-03-211-1/+1
|
* remove ach language, not supported by androidDominik Schürmann2014-03-216-222/+0
|
* Pull from transifexDominik Schürmann2014-03-2124-0/+1311
|
* Pull from transifexDominik Schürmann2014-03-2121-92/+294
|
* reformat mergeDominik Schürmann2014-03-212-59/+64
|
* Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-218-140/+185
|\ | | | | New Fix for #410
| * Fix GPL HeadersNikhil Peter Raj2014-03-213-3/+3
| |
| * Fix for #410Nikhil Peter Raj2014-03-218-142/+187
| |
* | Merge pull request #461 from honnel/ui-tasksDominik Schürmann2014-03-212-3/+7
|\ \ | | | | | | UI-Icon-Modifying #429
| * | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵Daniel Hammann2014-03-202-3/+7
| | | | | | | | | | | | and clipboard button
* | | Merge pull request #460 from honnel/uri-for-signDominik Schürmann2014-03-211-2/+2
|\ \ \ | |/ / |/| | URI is transported in intents data not extra. #459
| * | URI is transported in intents data not extra.Daniel Hammann2014-03-201-2/+2
|/ /
* | Merge pull request #457 from hav3n/branch-fix-certifyDominik Schürmann2014-03-202-72/+94
|\ \ | | | | | | Fix for #451
| * | Update fix for #451Nikhil Peter Raj2014-03-211-3/+2
| | |
| * | Cleanup for #451Nikhil Peter Raj2014-03-202-5/+0
| | |
| * | Fix for #451Nikhil Peter Raj2014-03-201-68/+96
| |/
* | Fix fingerprint handlingDominik Schürmann2014-03-209-21/+19
| |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-203-23/+28
|\ \
| * \ Merge pull request #456 from thi/adjust-fingerprint-layoutsDominik Schürmann2014-03-203-23/+28
| |\ \ | | |/ | |/| Adjust fingerprint layouts
| | * Move fingerprint up below the algorithm in key viewThialfihar2014-03-201-15/+15
| | | | | | | | | | | | | | | This makes it consistent with the key list entry layout and it also makes more sense, as it belongs to key identification.
| | * Move fingerprint to the right in key list entryThialfihar2014-03-201-8/+8
| | | | | | | | | | | | Fits much better there and doesn't separate the user ID.
| | * Group fingerprint again to make it visually consistentThialfihar2014-03-201-0/+5
| |/
* / verify downloaded key by comparing fingerprintsDominik Schürmann2014-03-201-35/+45
|/
* put colorize method into key helperDominik Schürmann2014-03-205-80/+89
|
* colorize fingerprint in importDominik Schürmann2014-03-201-1/+3
|
* Use getter and setterDominik Schürmann2014-03-203-40/+111
|
* Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-207-88/+91
|
* Merge pull request #455 from ↵Dominik Schürmann2014-03-202-5/+15
|\ | | | | | | | | thi/454-fix-convert-key-id-to-hey-to-handle-short-key-ids 454 fix convert key id to hey to handle short key ids
| * Add debug logging for hkp keyserver actionsThialfihar2014-03-201-5/+10
| |
| * Let convertKeyIdToHex handle short key IDsThialfihar2014-03-201-0/+5
|/ | | | If a short key ID is given, then it should only be displayed as such.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 09:38:22 +0000