 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 |
|
|
Dominik Schürmann
|
7fc80be660
|
Merge pull request #392 from honnel/cursor-reset2
Reset cursor query when closing search view #386
|
2014-03-11 00:15:22 +01:00 |
|
|
Dominik Schürmann
|
3f5de1eac6
|
Merge pull request #390 from uberspot/master
Appropriate save Icon in EditKeyActivity fixes #382
|
2014-03-10 23:48:53 +01:00 |
|
|
Dominik Schürmann
|
612ad9e6b3
|
Merge pull request #383 from sreeram-boyapati/master
Fix to passphrase dialog and Issue #207
|
2014-03-10 23:20:07 +01:00 |
|
|
Dominik Schürmann
|
8fa62161df
|
More fixes for KeychainIntentServiceHandler
|
2014-03-10 22:46:30 +01:00 |
|
|
Dominik Schürmann
|
d339029ab9
|
Pull from transifex
|
2014-03-10 22:40:59 +01:00 |
|
|
Dominik Schürmann
|
59091e417f
|
getString before init of KeychainIntentHandler
|
2014-03-10 22:37:13 +01:00 |
|
|
Dominik Schürmann
|
bac68c4c73
|
Fix progress_generating and reformat
|
2014-03-10 22:22:37 +01:00 |
|
|
Dominik Schürmann
|
be41a0a3e1
|
Fix progress_generating and reformat
|
2014-03-10 22:19:43 +01:00 |
|
|
Dominik Schürmann
|
da83c8ff60
|
@color/white instead of hex
|
2014-03-10 18:26:52 +01:00 |
|
|
Dominik Schürmann
|
d91e2673d7
|
Revert "Lint changes"
This reverts commit e00436b409.
|
2014-03-10 18:23:47 +01:00 |
|
|
Dominik Schürmann
|
ef8eb3f8b5
|
Merge pull request #381 from bhargavgolla/Lint-error-fix
Lint changes #223
|
2014-03-10 18:11:37 +01:00 |
|
|
Dominik Schürmann
|
83c346fec4
|
Make code more tidy for multiselect
|
2014-03-10 17:49:30 +01:00 |
|
|
Dominik Schürmann
|
caa0740919
|
Improve hightlight query code: make cursor abstract, tidy up code
|
2014-03-10 17:22:19 +01:00 |
|
|
Dominik Schürmann
|
70d1e01a2b
|
Merge pull request #384 from mb-14/search1
Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment
|
2014-03-10 17:05:09 +01:00 |
|
|
Dominik Schürmann
|
2166d66680
|
Cleanup ImportKeysListEntry
|
2014-03-10 17:06:11 +01:00 |
|
|
Dominik Schürmann
|
6a8fa61908
|
remove double definition of progress_generating
|
2014-03-10 16:58:58 +01:00 |
|
|
Dominik Schürmann
|
3372cfacb6
|
Merge pull request #385 from tharinduwijewardane/master
Issue #378 ( private keys are no longer red ): Fixed
|
2014-03-10 16:02:58 +01:00 |
|
|
Dominik Schürmann
|
8d85aa5876
|
remove unneeded replace for newline on fingerprint
|
2014-03-09 23:51:18 +01:00 |
|
|
Dominik Schürmann
|
a8add47238
|
Merge pull request #380 from uberspot/master
Colorize fingerprint
|
2014-03-09 23:48:51 +01:00 |
|
|
Dominik Schürmann
|
dd28303dc1
|
Merge pull request #368 from ajit766/master
progress is shown when creating the default key based on number of keys created till then
|
2014-03-09 23:39:53 +01:00 |
|
|
Dominik Schürmann
|
9a7a7f2b01
|
Merge pull request #372 from rafaelav/master
Issue #178 - Hide advanced options in EncryptActivity
|
2014-03-09 23:18:50 +01:00 |
|
|
Dominik Schürmann
|
50d9908baf
|
Merge pull request #369 from hav3n/branch-fixes
Fix for #347
|
2014-03-09 02:05:23 +01:00 |
|
|
Dominik Schürmann
|
5b255a263f
|
Fix key id and fingerprint handling, use full key ids
|
2014-03-09 01:49:25 +01:00 |
|
|
Dominik Schürmann
|
8dc7a72331
|
Merge pull request #316 from danielhass/import-error
Show error if file import has no content
|
2014-03-08 18:27:32 +01:00 |
|
|
Dominik Schürmann
|
402aeeabf3
|
use parameter in updateFromKeyserver
|
2014-03-08 17:19:57 +01:00 |
|
|
Dominik Schürmann
|
db05b3043a
|
beta4
|
2014-03-08 00:17:24 +01:00 |
|
|
Dominik Schürmann
|
0e33fd2392
|
Split api libs into OpenKeychain specific and OpenPGP Provider lib
|
2014-03-07 23:05:03 +01:00 |
|
|
Dominik Schürmann
|
2737aedca7
|
Revert "Fix for #347"
This reverts commit dd80ddd6f9.
|
2014-03-07 22:48:20 +01:00 |
|
|
Dominik Schürmann
|
882333ce05
|
Merge pull request #366 from uberspot/master
Minor code clean up
|
2014-03-07 22:39:53 +01:00 |
|