aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #477 from thi/adjust-getting-started-textDominik Schürmann2014-03-2517-17/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Change the getting started text
| * | | | | | | | | | Change the getting started textThialfihar2014-03-2417-17/+17
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "My Keys" is now wrapped into "Contacts".
* | | | | | | | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-2532-145/+78
|\| | | | | | | | |
| * | | | | | | | | 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
| |/ / / / / / / /
* | | | | | | | | More experimental work on API accountsDominik Schürmann2014-03-2523-434/+884
| | | | | | | | |
* | | | | | | | | put original license of launcher icon into repoDominik Schürmann2014-03-233-0/+69
| | | | | | | | |
* | | | | | | | | Extend provider for new api tablesDominik Schürmann2014-03-234-41/+222
| | | | | | | | |
* | | | | | | | | Move classes for OpenPGP API into remote packageDominik Schürmann2014-03-2312-19/+24
| | | | | | | | |
* | | | | | | | | New db table for api accountsDominik Schürmann2014-03-232-6/+25
|/ / / / / / / /
* | | | | | | | 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
|/ / / / / /