cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,565 Commits 1 Branch 0 Tags
07fdd6363f06b59aeb9206d64ed719a97a87ff99
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 07fdd6363f Change path to OpenKeychain 2014-04-01 18:49:19 +02:00
Dominik Schürmann d0947e8377 Only allow private keys associated to accounts of an app 2014-04-01 18:44:36 +02:00
Dominik Schürmann 2c5991b199 Add API image 2014-04-01 17:19:51 +02:00
Dominik Schürmann 2f9cb69a1e Cleanup 2014-04-01 17:13:53 +02:00
Dominik Schürmann ecca54d4d5 Automatically select newly created key in api accounts 2014-04-01 17:08:56 +02:00
Dominik Schürmann ddfb7e10e8 Fully qualified imports 2014-04-01 16:39:18 +02:00
Dominik Schürmann acc2e208cf Remove DECRYPT_ASSUME_SYMMETRIC 2014-04-01 16:18:16 +02:00
Dominik Schürmann 53605855ee Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-04-01 16:15:55 +02:00
Dominik Schürmann 7000ab37fd default to allow symmetric decryption 2014-04-01 16:15:50 +02:00
Dominik Schürmann 247ad6207a Merge pull request #501 from Valodim/master 
factor out android dependencies from PgpKeyOperation, and add JUnit/Robolectric testing stubs
 2014-04-01 16:13:41 +02:00
Dominik Schürmann ebb7f55921 Fix symmetric decryption 2014-04-01 16:08:40 +02:00
Dominik Schürmann fadc08480f Fix pre-selection for encrypt 2014-04-01 15:40:07 +02:00
Dominik Schürmann 19e5a3815a language 2014-04-01 15:36:27 +02:00
Dominik Schürmann ba81869038 More layout fixes 2014-04-01 15:33:56 +02:00
Dominik Schürmann ab8031fb52 More layout fixes 2014-04-01 15:32:14 +02:00
Dominik Schürmann 6e705e5519 Language clarifications 2014-04-01 15:19:12 +02:00
Dominik Schürmann ef562b5e20 Fix layouts 2014-04-01 15:04:54 +02:00
Dominik Schürmann 866d2d28cc Simplify encrypt and sign backend 2014-04-01 14:25:37 +02:00
Dominik Schürmann c859bbb6da Fix symmetric encryption and cleanup 2014-04-01 14:10:32 +02:00
Dominik Schürmann b020f950e1 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-04-01 13:31:57 +02:00
Dominik Schürmann 6a617e0bf8 Small layout fix (more to come) 2014-04-01 13:31:49 +02:00
Dominik Schürmann 4c3506f4b1 Experimental work on a fragment-based encrypt activity 2014-04-01 13:25:44 +02:00
Dominik Schürmann 8f2abf36f8 Layouts for new encrypt design 2014-03-31 20:04:05 +02:00
Dominik Schürmann bb2fb786a8 Include signature result in fragments 2014-03-30 21:33:00 +02:00
Dominik Schürmann 55a2cbe9c3 Decrypt mostly works again 2014-03-30 20:53:16 +02:00
Dominik Schürmann ccce28acdb compiles again 2014-03-30 19:35:35 +02:00
Dominik Schürmann 2947ab7e48 More experimental work on decrypt fragments 2014-03-30 19:32:05 +02:00
Dominik Schürmann 4cec2194e0 Experiments with fragments in decrypt activity 2014-03-30 19:32:04 +02:00
Dominik Schürmann 224e8a7554 Remove cancel from app menu 2014-03-30 19:29:07 +02:00
Dominik Schürmann 583467356c Revert "Remove cancel from app menu" 
This reverts commit 3c0b97f280.
 2014-03-30 19:28:35 +02:00
Dominik Schürmann 3c0b97f280 Remove cancel from app menu 2014-03-30 19:26:41 +02:00
Dominik Schürmann 7b53150ad5 Remove FLAG_ONE_SHOT from most PIs 2014-03-30 19:25:39 +02:00
Dominik Schürmann fc4f9beb6a Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-30 19:18:41 +02:00
Dominik Schürmann e3a7d372a3 Increase API_VERSION to 3 2014-03-30 19:18:18 +02:00
Dominik Schürmann b648d87d76 Parcelable versioning 2014-03-30 19:13:10 +02:00
Dominik Schürmann 6b5d60e1f4 Merge pull request #491 from openpgp-keychain/edit-key 
Edit key changes
 2014-03-30 18:04:43 +02:00
Dominik Schürmann b2342744b5 Actually use fixBadCharactersForGmail 2014-03-30 14:02:09 +02:00
Dominik Schürmann c8defe2e6d Merge pull request #489 from mb-14/clipboard_fp 
Enable importing of fingerprints from clipboard.
 2014-03-27 21:47:33 +01:00
Dominik Schürmann 68668fd444 Version 2.4 2014-03-26 22:56:51 +01:00
Dominik Schürmann 619c079f00 Sync changelog and about with transifex 2014-03-26 22:55:33 +01:00
Dominik Schürmann a589b6e7fe Changelog for 2.4 2014-03-26 22:48:23 +01:00
Dominik Schürmann 8e9ceffae3 Changelog for 2.4 2014-03-26 22:45:35 +01:00
Dominik Schürmann 19bbaecf32 Update from transifex 2014-03-26 22:20:23 +01:00
Dominik Schürmann cc8fd35137 Show divider only when used 2014-03-26 18:34:48 +01:00
Dominik Schürmann ac134790a0 Text for creation of new api accounts 2014-03-26 18:23:48 +01:00
Dominik Schürmann 399106015e Rename layouts for remote activity 2014-03-26 18:18:00 +01:00
Dominik Schürmann aba6a44a0a Improve demo for API accounts 2014-03-26 18:13:48 +01:00
Dominik Schürmann 2e063a42ed Fix provider for API_ACCOUNTS 2014-03-26 17:55:48 +01:00
Dominik Schürmann ba37fc254d Accounts activity prettified 2014-03-26 17:50:16 +01:00
Dominik Schürmann 65857d2b5f Accounts list prettified 2014-03-26 17:43:26 +01:00
Dominik Schürmann de553e9b43 Merge pull request #483 from uberspot/master 
fix capability icons and remove red text for revoked keys
 2014-03-26 14:11:04 +01:00
Dominik Schürmann ec34597331 Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOT 2014-03-26 14:11:28 +01:00
Dominik Schürmann 0d5e99e1f0 Coding style 2014-03-26 13:42:16 +01:00
Dominik Schürmann e5fe4245bf remove old icon entry 2014-03-26 13:39:30 +01:00
Dominik Schürmann b75428daf7 Revert "Update README.md, icon set not used anymore" 
This reverts commit 9d4582f968.
 2014-03-26 13:38:45 +01:00
Dominik Schürmann f10235220d Forgot resource 2014-03-26 13:32:36 +01:00
Dominik Schürmann de718c24c4 Merge pull request #482 from uberspot/master 
Fix style for expired/revoked keys
 2014-03-26 13:23:50 +01:00
Dominik Schürmann 92a4d0e914 Part 2 of basic user interface for api accounts 2014-03-26 13:21:29 +01:00
Dominik Schürmann 9542dc0e12 Accounts API, user interface 2014-03-26 13:07:32 +01:00
Dominik Schürmann 930d722013 Simplify can encrypt check 2014-03-26 00:40:13 +01:00
Dominik Schürmann 30a002634d Merge pull request #471 from sreeram-boyapati/encryption 
Added can_encrypt check
 2014-03-26 00:33:29 +01:00
Dominik Schürmann dbbb782911 Merge pull request #479 from AlexanderS/subkey-expiry 
Display expiry of subkeys in single key view.
 2014-03-26 00:20:17 +01:00
Dominik Schürmann 028af0c119 Fix constraints and insert 2014-03-26 00:11:49 +01:00
Dominik Schürmann 0edfd7ed48 Temporary fix for inserting by content provider 2014-03-25 23:25:03 +01:00
Dominik Schürmann cb3e149c14 Merge pull request #474 from honnel/empty-list-flash 
Empty list flash
 2014-03-25 23:14:45 +01:00
Dominik Schürmann 758aabd751 Merge pull request #475 from thi/master 
Add recent contributors to credits
 2014-03-25 23:11:09 +01:00
Dominik Schürmann dc9fd12213 Return account creation intent if account does not exists in db 2014-03-25 23:09:57 +01:00
Dominik Schürmann 8c496d3393 Fix update and insert for new api content provider 2014-03-25 21:52:06 +01:00
Dominik Schürmann cff35ca842 More experimental work on api accounts 2014-03-25 21:23:59 +01:00
Dominik Schürmann 031beed680 Merge pull request #477 from thi/adjust-getting-started-text 
Change the getting started text
 2014-03-25 19:11:29 +01:00
Dominik Schürmann 7111a4265d Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-25 19:11:32 +01:00
Dominik Schürmann aa35b1f4b5 More experimental work on API accounts 2014-03-25 19:11:20 +01:00
Dominik Schürmann 41fc7b6344 Merge pull request #476 from thi/rename-old-apg-things 
Rename old mentionings of APG-named things
 2014-03-23 22:13:16 +01:00
Dominik Schürmann 4e2e40f404 Merge pull request #473 from thi/master 
Adjust credits, align signature in encrypt layout slightly, fix file decryption, remove icon set credits
 2014-03-23 20:13:21 +01:00
Dominik Schürmann b4b709b1e0 put original license of launcher icon into repo 2014-03-23 19:42:17 +01:00
Dominik Schürmann f082b53118 Extend provider for new api tables 2014-03-23 02:17:39 +01:00
Dominik Schürmann 9555ae3bc1 Move classes for OpenPGP API into remote package 2014-03-23 01:26:49 +01:00
Dominik Schürmann 12402d9a51 New db table for api accounts 2014-03-23 01:16:56 +01:00
Dominik Schürmann ff67ddc5f4 Merge pull request #469 from honnel/save-key-workaround 
Can't save key after key generation
 2014-03-23 00:13:18 +01:00
Dominik Schürmann 153b99a186 Use new FoldableLinearLayout in API settings 2014-03-23 00:03:49 +01:00
Dominik Schürmann 14dab821b7 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-22 23:46:15 +01:00
Dominik Schürmann 90efc7f2a0 Merge pull request #467 from uberspot/master 
Make foldable settings in EncryptActivity into a separate widget
 2014-03-22 23:44:50 +01:00
Dominik Schürmann 25e5360bee Merge pull request #468 from honnel/ui-createkey 
Because of an unknown reason toast messages were commented out.
 2014-03-22 23:44:32 +01:00
Dominik Schürmann b7bc8faee6 raname to mKeychainDatabase 2014-03-21 11:43:30 +01:00
Dominik Schürmann 1b57a10bb6 Fix nfc help button 2014-03-21 11:26:18 +01:00
Dominik Schürmann c6189c5218 remove ach language, not supported by android 2014-03-21 10:29:29 +01:00
Dominik Schürmann c85a0e9cca Pull from transifex 2014-03-21 10:28:34 +01:00
Dominik Schürmann 4dac00bb21 Pull from transifex 2014-03-21 10:28:26 +01:00
Dominik Schürmann 620c67f441 reformat merge 2014-03-21 10:05:59 +01:00
Dominik Schürmann 8fead6fddb Merge pull request #458 from hav3n/branch-delete-fix 
New Fix for #410
 2014-03-21 09:59:19 +01:00
Dominik Schürmann a7ea9d4eca Merge pull request #461 from honnel/ui-tasks 
UI-Icon-Modifying #429
 2014-03-21 09:59:14 +01:00
Dominik Schürmann 81624aa648 Merge pull request #460 from honnel/uri-for-sign 
URI is transported in intents data not extra. #459
 2014-03-21 09:57:27 +01:00
Dominik Schürmann 58b22d1213 Merge pull request #457 from hav3n/branch-fix-certify 
Fix for #451
 2014-03-20 20:12:43 +01:00
Dominik Schürmann 59d51fe68e Fix fingerprint handling 2014-03-20 19:48:18 +01:00
Dominik Schürmann df6fff93f0 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-20 19:11:59 +01:00
Dominik Schürmann 0510e0e217 verify downloaded key by comparing fingerprints 2014-03-20 19:11:51 +01:00
Dominik Schürmann 7edc062147 Merge pull request #456 from thi/adjust-fingerprint-layouts 
Adjust fingerprint layouts
 2014-03-20 19:08:42 +01:00
Dominik Schürmann 77365202e0 put colorize method into key helper 2014-03-20 16:10:42 +01:00
Dominik Schürmann 81e0d04230 colorize fingerprint in import 2014-03-20 16:09:05 +01:00
Dominik Schürmann 36815b9185 Use getter and setter 2014-03-20 16:04:05 +01:00