cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,445 Commits 1 Branch 0 Tags
65857d2b5fea5cbb5d156b1b4ddfd68ded311624
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominik Schürmann 2b77489932 Dont try to parse key/fingerprint result from keyserver query 2014-03-20 15:54:49 +01:00
Dominik Schürmann 747a41a0be Merge pull request #455 from 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
 2014-03-20 14:31:09 +01:00
Dominik Schürmann 4137fbff5b Merge pull request #453 from thi/452-unrevoked-keys-displayed-in-red 
Fix key list views in main key view
 2014-03-20 11:35:48 +01:00
Dominik Schürmann 107affcb34 Merge pull request #450 from uberspot/master 
add apg's fix for Key id display
 2014-03-19 17:33:30 +01:00
Dominik Schürmann 52838a50c1 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-19 16:22:26 +01:00
Dominik Schürmann 8059c78e55 Remove oxygen text from icon 2014-03-19 16:22:22 +01:00
Dominik Schürmann 12b97d251a Cleanup 2014-03-19 16:22:10 +01:00
Dominik Schürmann 41fda151dc Merge pull request #448 from AlexanderS/lint-fixes 
use correct LongSparseArray for minimum api level
 2014-03-19 15:41:15 +01:00
Dominik Schürmann 3416e51f84 Merge pull request #445 from gogowitczak/rwrsa-branch 
Disabled possibility to generate weak RSA keys (512 and 1024 bit)
 2014-03-19 09:40:28 +01:00
Dominik Schürmann 9d60224980 Cleanup SelectSecretKeyActivity and also return Uri 2014-03-18 19:36:59 +01:00
Dominik Schürmann 38ffa66682 Merge pull request #443 from uberspot/master 
CertifyKeyActivity sets error if no key is selected
 2014-03-18 19:17:50 +01:00
Dominik Schürmann 4aa24413de revert ca_necrypt patch 2014-03-18 18:35:59 +01:00
Dominik Schürmann 6a854a86dd Merge pull request #441 from uberspot/master 
fix emails not showing up in import keyserver search
 2014-03-18 18:27:22 +01:00
Dominik Schürmann 9badff0b5b Merge pull request #434 from honnel/revocation-status 
Show revocation status in ViewKeyKeysAdapter #375
 2014-03-18 16:45:44 +01:00
Dominik Schürmann b97097d8d9 Merge pull request #437 from sreeram-boyapati/encrypt 
Can_Encrypt Check added to hide Button
 2014-03-18 16:45:38 +01:00
Dominik Schürmann fe3d6bafc3 Merge pull request #435 from sreeram-boyapati/change_passphrase 
Button Text changes to Change Passphrase if Passphrase is set
 2014-03-18 16:30:42 +01:00
Dominik Schürmann eebf1c171a add mr option in keyserver class before query (code simplification) 2014-03-18 16:29:40 +01:00
Dominik Schürmann d1f0374620 Merge pull request #424 from gogowitczak/mro-branch 
Machine readable output for Keyserver query
 2014-03-18 15:56:46 +01:00
Dominik Schürmann 72a5d6d870 Merge pull request #431 from honnel/ui-modification 
Ui modification
 2014-03-18 14:57:32 +01:00
Dominik Schürmann 711a51f7fc Merge pull request #430 from Valodim/certify 
Revamp certify dialogue
 2014-03-18 14:43:20 +01:00
Dominik Schürmann 30644b5c4f Merge pull request #420 from gogowitczak/master 
Added FAQ: specifying connection port for Keyserver.
 2014-03-18 14:24:53 +01:00
Dominik Schürmann 77b8b870ee Merge pull request #421 from uberspot/master 
Fix export for new unified key list #409 and lock drawer in tablets #255
 2014-03-18 14:14:21 +01:00
Dominik Schürmann efab1d27ac Merge pull request #417 from uberspot/master 
Make email address less restrictive and fix double user ids
 2014-03-14 07:04:32 +01:00
Dominik Schürmann c737f01a72 Merge pull request #415 from uberspot/master 
final code style changes
 2014-03-13 22:12:06 +01:00
Dominik Schürmann b1476a7429 Merge pull request #413 from uberspot/master 
More code style fixes
 2014-03-13 21:49:58 +01:00
Dominik Schürmann 37c81400ac Fix colors in item view 2014-03-13 20:18:25 +01:00
Dominik Schürmann c1e16995db remove unused color 2014-03-13 20:12:57 +01:00
Dominik Schürmann ba9a4bec3a Improve list item view, borderless button for API < 11 2014-03-13 20:11:21 +01:00
Dominik Schürmann 793d8c266a Merge pull request #412 from uberspot/master 
Code style changes
 2014-03-13 19:40:56 +01:00
Dominik Schürmann 5b907f222e Merge pull request #407 from uberspot/master 
Add apg's change to colorizing, no more background changes needed
 2014-03-13 19:09:13 +01:00
Dominik Schürmann 5c5e9d8e32 Forgot faq file 2014-03-13 19:09:54 +01:00
Dominik Schürmann bc1a3850ac Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-13 19:08:29 +01:00
Dominik Schürmann 908cf8e769 Add FAQ tab to help 2014-03-13 19:08:03 +01:00
Dominik Schürmann 32dcf86212 Merge pull request #408 from gogowitczak/master 
Specifying connection port in KeyServer
 2014-03-13 19:02:35 +01:00
Dominik Schürmann 4c5ae3cdaa Readd create key menu items 2014-03-13 19:01:24 +01:00
Dominik Schürmann cf51e5ff56 XML cleanup and bigger filename EditText 2014-03-13 18:53:21 +01:00
Dominik Schürmann 471cefa71f Cleanup and simplification 2014-03-13 18:27:08 +01:00
Dominik Schürmann fb1b0deaf5 Merge pull request #403 from Valodim/master 
unify public and secret key lists
 2014-03-13 18:14:19 +01:00
Dominik Schürmann f5c50c3896 Merge pull request #388 from ajit766/exportkeyfix 
Export is cancellable now
 2014-03-13 09:35:07 +01:00
Dominik Schürmann 217f4a1cef Merge pull request #396 from bhargavgolla/Lint-error-fix 
Lint error fix after testing
 2014-03-12 22:28:25 +01:00
Dominik Schürmann 65633112a0 Merge pull request #404 from uberspot/master 
Change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc
 2014-03-12 22:12:51 +01:00
Dominik Schürmann c8c8d8f4b6 Merge pull request #405 from honnel/checkstyle 
Checkstyle configuration information reworked
 2014-03-12 22:10:11 +01:00
Dominik Schürmann 0749eef1c5 Merge pull request #406 from Emantor/tests_and_travis 
Reduce travis library installation overhead
 2014-03-12 22:09:50 +01:00
Dominik Schürmann a9e5619a14 Merge pull request #395 from uberspot/master 
Remove duplicate code from ActionBarHelper. Add export in multiselect.
 2014-03-12 16:23:22 +01:00
Dominik Schürmann 5a5509053f Merge pull request #397 from tharinduwijewardane/master 
Fix for Issue #393 ( PublicKeyListFragment: Query not really resetted )
 2014-03-12 16:12:35 +01:00
Dominik Schürmann c7f4fc72d8 Merge pull request #402 from mb-14/hkpget 
Fix error in  importing/updating keys from keyserver by removing extra 0x
 2014-03-12 15:59:47 +01:00
Dominik Schürmann c9b117b706 more tight layout 2014-03-11 00:31:13 +01:00
Dominik Schürmann 50ed5db001 cleanup 2014-03-11 00:28:28 +01:00
Dominik Schürmann 05126a7d15 Merge pull request #394 from sreeram-boyapati/master 
linear layout edited to display test horizontally #391
 2014-03-11 00:25:26 +01:00