Thialfihar
77a6c509f7
Replace wildcard imports with explicit imports
2014-04-02 13:37:12 +02:00
Thialfihar
a3a5085afb
Spacing corrections
2014-04-02 13:37:12 +02:00
Thialfihar
592ab31d86
Add missing and curly brackets and fix others
...
Style guide demands them even for single-line blocks, and opening
curly brackets never appear on a line on their own.
2014-04-02 10:51:02 +02:00
Thialfihar
82e5d14fb1
Rearrange too long lines
2014-04-02 10:51:02 +02:00
Thialfihar
d5983b324f
Adjust variable/member naming to conform to style guide
...
In some cases change member accessibility, so the naming matches.
Also, some key words were reordered to comply with JLS suggestions.
2014-04-02 10:51:02 +02:00
Thialfihar
dd4a1e3f52
Trivial spacing changes to conform to style guide
2014-04-02 10:51:02 +02:00
Thialfihar
8e503bd263
Adjust copyright headers
2014-04-02 10:51:02 +02:00
Thialfihar
e92658f44d
Adjust import order
2014-04-02 10:51:02 +02:00
Ashley Hughes
5583fd513e
always ask
2014-04-02 01:28:53 +01:00
Ashley Hughes
9764d3fcb9
confirm that empty IDs are really wanted
2014-04-02 01:26:51 +01:00
Ashley Hughes
6d4a09f989
allow blank IDs, allow adding new IDs and let them be master
2014-04-02 00:00:24 +01:00
Ashley Hughes
2ad616ed3f
pass through info that keys are new without relying on new keys orginally being empty
2014-04-01 23:37:13 +01:00
Dominik Schürmann
d8001f9bbd
Menu cleanup
2014-04-01 19:31:57 +02:00
Dominik Schürmann
c414dd2fe9
Dont show encrypted data before decryption from clipboard
2014-04-01 19:00:14 +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
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
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
4c3506f4b1
Experimental work on a fragment-based encrypt activity
2014-04-01 13:25:44 +02:00
Ashley Hughes
9283205ea8
don't disable save button, show message if nothing needs to be done
2014-04-01 00:37:18 +01:00
Ashley Hughes
47b23a90d5
change how new default keys are passed back, fix showing their usage flags
2014-03-31 22:42:24 +01: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
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
Ashley Hughes
e1d07214df
merge master
2014-03-29 13:21:39 +00:00
Miroojin Bakshi
d5e3958565
Enable importing of fingerprints from clipboard.
2014-03-28 00:34:24 +05:30
Ashley Hughes
140646fa12
pass through original primary ID
2014-03-27 13:35:03 +00:00
Dominik Schürmann
cc8fd35137
Show divider only when used
2014-03-26 18:34:48 +01:00
uberspot
c8b7717105
fix capability icons and remove red text for revoked keys
2014-03-26 14:46:03 +02:00
uberspot
8d23ba968a
add strike through text for revoked or expired keys and disable views for revoked keys as well
2014-03-26 14:07:41 +02: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
Alexander Sulfrian
4e481512c3
Display expiry of subkeys in single key view.
2014-03-25 05:29:52 +01:00
Thialfihar
c9053b97a8
Rename old mentionings of APG-named things
...
Mostly in comments, most importantly: STORE_PATH now ends in
/KeychainBlobs instead of /ApgBlobs
2014-03-23 21:58:18 +01:00
Thialfihar
a2048773ee
Fix file decryption interface
...
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.
2014-03-23 19:40:09 +01:00
Sreeram Boyapati
57f9b55677
Added can_encrypt check
2014-03-23 14:35:48 +05:30
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
Daniel Hammann
0f6dc253a4
Because of an unknown reason toast messages were commented out.
2014-03-21 23:01:24 +01:00
uberspot
8f37569967
Make foldable settings in EncryptActivity a separate widget
2014-03-21 19:09:17 +02:00
Dominik Schürmann
1b57a10bb6
Fix nfc help button
2014-03-21 11:26:18 +01:00
