77a6c509f7
Replace wildcard imports with explicit imports
2014-04-02 13:37:12 +02:00
82e5d14fb1
Rearrange too long lines
2014-04-02 10:51:02 +02:00
dd4a1e3f52
Trivial spacing changes to conform to style guide
2014-04-02 10:51:02 +02:00
d0947e8377
Only allow private keys associated to accounts of an app
2014-04-01 18:44:36 +02:00
556d6ff226
revert mistake
2014-03-29 15:19:38 +00:00
e1d07214df
merge master
2014-03-29 13:21:39 +00:00
028af0c119
Fix constraints and insert
2014-03-26 00:11:49 +01:00
aa35b1f4b5
More experimental work on API accounts
2014-03-25 19:11:20 +01:00
f082b53118
Extend provider for new api tables
2014-03-23 02:17:39 +01:00
9555ae3bc1
Move classes for OpenPGP API into remote package
2014-03-23 01:26:49 +01:00
4e6325a140
Fix GPL Headers
2014-03-21 01:56:33 +05:30
2816461283
Fix for #410
2014-03-21 01:50:20 +05:30
2d0817bd74
final code style changes
2014-03-13 23:03:20 +02:00
69f5bf6b57
Merge branch 'unified-keylist'
...
Conflicts:
OpenPGP-Keychain/src/main/AndroidManifest.xml
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
OpenPGP-Keychain/src/main/res/menu/key_list.xml
OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
2014-03-12 18:05:28 +01:00
361c45a481
Make export work with rowIds instead of MasterKeyIds
2014-03-11 03:22:05 +02:00
059e57c5d0
Colorize fingerprint
2014-03-09 04:14:23 +02:00
5b255a263f
Fix key id and fingerprint handling, use full key ids
2014-03-09 01:49:25 +01:00
706e212b6b
add edit button and secret key info to public key view
2014-03-08 13:17:52 +01:00
aa8a8f069f
Normalize public key uri in KeyListFragment
...
Find the explicit row id of the public key id given in the uri in
KeyListFragment and work with that. This way, passing in uris by
master key id, mail address, or any other criteria, works.
Might be a good idea to add an actual check if the row id is non-zero
here, but not sure how to do a "bad intent" thing
2014-03-08 12:07:20 +01:00
191c5b8130
Make EditKeyActivity's uri handling (more) sane
...
This activity didn't actually use the uri for anything, but just chopped
off the last path segment and interpreted it as row id. What the hell.
2014-03-08 11:58:26 +01:00
ca851ba21f
remove unused imports and unthrown exceptions
2014-03-07 22:35:49 +02:00
fba0e2af1d
keep up with master
2014-03-07 15:16:13 +00:00
8e29b82d6d
corrected commit
...
mCurrentPassPhrase, mChangePassPhrase
Minor variable naming Issue #338
2014-03-07 00:43:09 +05:30
1b25ec5a0c
master merge
2014-02-22 10:27:03 +00:00
0c4b809195
rework key view into fragments to later add certifications
2014-02-09 21:17:30 +01:00
616c903a2a
do not delete pub keys where secret key exists
2014-02-06 01:02:18 +01:00
82b94838c3
fix certify keys without sign flag
2014-02-04 00:38:19 +00:00
b87f0b2658
save fingerprint on save
2014-02-01 16:35:53 +01:00
c4340b2379
No bouncy castle objects in key view
2014-02-01 16:34:42 +01:00
5359205b50
Fix layout, add API notes to README, register fingerprint URIs, some reformatting (sry)
2014-02-01 16:17:33 +01:00
f276455624
save keyring in-place, fixes #228 , #203
2014-01-29 03:06:26 +01:00
cb3ca37db9
New Gradle project structure
2014-01-27 14:18:25 +01:00
Thialfihar