f0e159a372
add SignEncryptResult parcel (probably break stuff)
2014-09-14 00:33:30 +02:00
db5d12800c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-14 00:11:28 +02:00
179f48a4de
First work on decrypt
2014-09-14 00:11:23 +02:00
0625a16cb5
Temporary fix for #848 , fixed pull2refresh bugs
2014-09-13 23:57:54 +02:00
d5c9021b89
Hack to disable overscroll effect of swipe to update
2014-09-13 23:08:04 +02:00
c9fee47fb3
Custom actionbar to indicate swipe down effect
2014-09-13 22:55:27 +02:00
ff65733ed3
move IS_REVOKED table prefix to the right places
...
Fixes #849
2014-09-13 22:08:53 +02:00
f8677a5f16
Merge branch 'result-parcels'
2014-09-13 21:32:17 +02:00
a1323a1a14
deactivate screenshots in new PassphraseDialogActivity
2014-09-13 21:17:19 +02:00
efd9d1626e
add a ton of logging to DecryptVerify
2014-09-13 21:14:06 +02:00
3bc3bc6d58
More smaller UI fixes
2014-09-13 21:01:47 +02:00
be4882f5c1
If expired/revoked, disable both encrypt buttons
2014-09-13 20:53:07 +02:00
a8a1f352a8
Add new PassphraseDialogActivity, a transparent activity that only holds the passphrase dialog
2014-09-13 20:29:08 +02:00
d73ea5f612
Fix share to encrypt text
2014-09-13 20:07:22 +02:00
7d41800e57
Use spannable directly instead of html conversion in SubkeysAdapter
2014-09-13 19:49:16 +02:00
dbbefe2f41
working version of DecryptVerifyResult
2014-09-13 19:30:10 +02:00
a41b9f08d0
Merge pull request #843 from da-kid/master
...
Implemented Pull2Refresh
2014-09-13 19:10:54 +02:00
4c636a1471
introduce OperationResultParcel for PgpDecryptVerify operations (WIP)
2014-09-13 17:54:10 +02:00
a86ec573fa
Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers
2014-09-13 17:02:10 +02:00
19252380f1
promote all result parcels to top level classes in their own package
2014-09-13 14:36:23 +02:00
fd5e5afc9f
Implemented Pull2Refresh in the KeyListFragment
...
Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection
Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs
Added Pull2Refresh to the KeyListFragment
2014-09-12 22:44:45 +02:00
40c81c9429
fix key upload after certification (hopefully?)
2014-09-12 11:55:14 +02:00
4e834d7833
add ui support for stripping subkeys
2014-09-11 22:50:44 +02:00
d61d846b72
add some comments to previous commit
2014-09-10 01:04:13 +02:00
7dbb7cf1e1
jury-rig broken sign mechanism
...
Should improve situation on #811
2014-09-09 22:43:14 +02:00
7c67f7a715
Consolidate on database upgrade
2014-09-09 09:26:03 +02:00
ceea2667e8
introduce SingletonResult for... singleton results
2014-09-08 14:50:16 +02:00
055fb59ec3
Properly handle uneditable key types in EditKeyFragment
...
More specifically, return an OperationResultParcel for stripped and
divert-to-card keys, with an appropriate error message in the log.
part of #828
2014-09-08 14:35:15 +02:00
9eb65601c4
Revert changes in DecryptFileFragment
2014-09-08 14:10:45 +02:00
518d7116e2
Work on Yubikey decryption
2014-09-08 14:04:46 +02:00
f4592c8b95
Yubikey: use PIN
2014-09-08 00:40:50 +02:00
605e37f089
Dont show key_unavailable on pub keys
2014-09-07 22:06:37 +02:00
4c2419642b
Remove SelectSecretKey, not used anymore
2014-09-07 19:18:19 +02:00
6c3f6dc74a
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-07 19:01:28 +02:00
ef30d842d8
API fixes
2014-09-07 18:59:56 +02:00
857fc43873
Update and fix Intent API
2014-09-07 18:50:58 +02:00
0b091aa642
flag revoked, epired and unavailable keys in selection spinner
2014-09-07 18:49:29 +02:00
65a0a0e34f
Make Intent API as recommended in http://developer.android.com/guide/components/intents-filters.html
2014-09-07 18:26:43 +02:00
597eb268f4
add error text on bad passphrase
2014-09-07 17:04:13 +02:00
3ba2e0b0c1
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-09-07 17:01:07 +02:00
d1e08f9305
Two buttons to encrypt files and text, some fixes
2014-09-07 17:00:58 +02:00
31cc004fe1
make EditKeyFragment work with new PassphraseDialog
2014-09-07 16:55:07 +02:00
fd7bdbf54f
add proper async check for correct passphrase to passphrasedialog
2014-09-07 16:54:39 +02:00
0e83df21cf
More UI rework
2014-09-07 15:30:32 +02:00
0d1c9f7745
Remove file menu items from text activity
2014-09-06 18:06:48 +02:00
05a29a1f8f
No inception with APG
2014-09-06 18:05:06 +02:00
cc14119425
Fix AndroidManifest for new encrypt activities
2014-09-06 17:55:19 +02:00
f2f1a9516d
Share helper
2014-09-06 17:39:00 +02:00
59f32c4fca
Drawer nav method cleanup
2014-09-06 16:36:58 +02:00
30978384af
Remove unused gmail clearup method
2014-09-06 16:28:31 +02:00
6e3973e26a
Add experimental support for yubikey PINs, remove caching of empty passphrases
2014-09-05 20:04:07 +02:00
fa9bbdd60c
Add yubikey default PIN preference
2014-09-05 19:40:04 +02:00
8cf4e25320
Safeslinger: more simplification
2014-09-04 14:59:39 +02:00
7b51718c92
Safeslinger: cleanup
2014-09-04 14:56:30 +02:00
b1c3bfa157
Safeslinger: get all bytes
2014-09-04 14:34:59 +02:00
4872fd5b2d
Use bytes to share via safeslinger, import on result
2014-09-04 13:44:01 +02:00
d0f46f1efb
Integrate safeslinger share
2014-09-04 12:54:16 +02:00
7bc424a8cb
work on passphrase caching, make use of cached SecretKeyType data (WIP!)
2014-09-03 02:43:06 +02:00
e0905a3afb
cache key s2k type in database, for later use
2014-09-02 01:24:16 +02:00
a97ebc1ec9
Lock drawer in EncryptFileActivity if called from intent
...
Closes #810
2014-09-01 23:46:22 +02:00
f8625f5310
rename EncryptMessageFragment -> EncryptTextFragment
2014-09-01 23:46:14 +02:00
b3d3026de7
remove redundant check from EncryptFileActivity
2014-09-01 23:38:11 +02:00
2ead78a1e5
split EncryptActivity into Encrypt{Text,File}Activity
2014-09-01 23:25:03 +02:00
6b5e65253c
small ui changes in encrypt
2014-09-01 21:43:15 +02:00
40e6b24b14
Prepare API for OpenPgpSignatureResult extensions
2014-08-31 23:50:04 +02:00
9258fbfb74
Cleanup keyspinner layout, key id typeface monospace
2014-08-31 20:39:36 +02:00
e9a2f256b9
add cancel prevention mechanism, improve cancellation for key import
2014-08-31 20:05:19 +02:00
e46bc24079
add cancel support to edit key action
2014-08-31 19:20:08 +02:00
7da7832284
Add cancelable mechanism and support in key import
...
Closes #323
2014-08-31 17:32:13 +02:00
38c6cf045c
remember "show advanced tabs" setting
...
Closes #669
2014-08-31 00:39:37 +02:00
a73abf57f1
if there is only one private key, use it fo certification by default
2014-08-31 00:19:59 +02:00
0738a38bbe
use LoaderFragment for CertifyActivity
2014-08-31 00:19:16 +02:00
b193965e58
Merge pull request #796 from open-keychain/develop
...
ECC support
2014-08-28 10:46:58 +02:00
4aeacd5b51
Fix NullPointerException in ImportKeysActivity
2014-08-28 10:40:11 +02:00
86a05033ae
Cleanup FoldableLinearLayout
2014-08-27 13:54:33 +02:00
783dae8804
add ecc support
2014-08-24 16:08:37 +02:00
3acbe9052f
Add ECDH and ECDSA values
2014-08-21 15:40:09 +02:00
7adff7c7df
Add info about device with intent chooser bug
2014-08-21 14:41:32 +02:00
b7de91ad51
Disable custom intent chooser
2014-08-21 14:07:37 +02:00
562e379c56
Fix nullpointer when revoking keys
2014-08-21 11:40:48 +02:00
d1ef355f55
Fix result handling in account settings
2014-08-21 00:29:49 +02:00
63ca81d871
Copyright (C) 2014 Vincent Breitmoser
2014-08-21 00:02:27 +02:00
9c9fc5330a
small change to make android studio recognize a honeycomb-only block
2014-08-20 23:09:20 +02:00
dcf268bcb2
move key deletion into KeychainIntentHandler
2014-08-20 23:08:52 +02:00
945764b30f
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-20 22:38:28 +02:00
9122d43d0a
close actionmode in keylist on loading events (avoid inconsistent state)
2014-08-20 21:51:19 +02:00
45706e6534
Notify duration, cleanup
2014-08-20 21:09:46 +02:00
937c91eefa
Fix nullpointer in first time activity
2014-08-20 20:44:49 +02:00
735040e193
return some more results
2014-08-20 20:24:19 +02:00
50c33ef322
progress dialog design fix
2014-08-20 20:13:25 +02:00
47bcc6149e
return some more results
2014-08-20 20:08:51 +02:00
0e152d1db0
Merge branch 'master' of github.com:open-keychain/open-keychain
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-08-20 19:48:19 +02:00
f46f2b6895
Fixes and temporary fixes for returning results
2014-08-20 19:46:44 +02:00
fe1f5489ff
consolidate: implement (mostly) recovery mode
2014-08-20 19:34:36 +02:00
1a6734f29c
Fix mime types, #781
2014-08-19 18:54:48 +02:00
4f8ddad9d3
ConsolidateDialogActivity
2014-08-19 16:40:57 +02:00
4be8c36b43
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-19 16:31:59 +02:00
5f8bbab569
Scroll fixes for certify activity
2014-08-19 16:31:51 +02:00
a2ae318a1a
add OpenDialogActivity (stub)
2014-08-19 15:55:40 +02:00
6ffdafc0e6
Add license headers
2014-08-19 10:01:39 +02:00
a5d34478df
Add subkey: at least one flag should be selected!
2014-08-18 11:13:52 +02:00
3e7ce0008f
Fixes for expiry UI
2014-08-18 11:02:41 +02:00
56fb822034
Merge pull request #772 from mar-v-in/issue-729
...
Remove NoSwipeWrapContentViewPager
2014-08-17 15:46:27 +02:00
57b2440731
Work-around rendering bug when switching back to asymmetric with multiple recipients selected
2014-08-17 11:31:41 +02:00
3cc57a092a
Remove NoSwipeWrapContentViewPager
2014-08-17 11:07:34 +02:00
14290c3ce9
consolidate: working implementation, lacking ui
2014-08-17 03:29:03 +02:00
aa625d4fbf
parametrize FileImportCache for filename
2014-08-17 00:49:14 +02:00
f206902002
Fixing date picker issues
2014-08-16 16:17:46 +02:00
ccf58a92fa
Fix flags UI in add subkey dialog
2014-08-16 13:42:55 +02:00
4d698c896a
Fix expiry when adding subkeys
2014-08-16 12:28:49 +02:00
474fc50b80
Always return a SaveKeyringResult from saving
2014-08-16 12:24:46 +02:00
09d37a5fa6
fix keys with no expiry in ui code
2014-08-14 22:12:18 +02:00
0f60bcbc3d
Pass through of master key id in SaveKeyringResult
2014-08-14 19:25:39 +02:00
28df004cbb
Merge pull request #767 from mar-v-in/issue-763
...
Use dropdown in CertifyActivity
2014-08-14 18:53:40 +02:00
a58440b85d
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-14 18:51:44 +02:00
65e76f6e44
hacky fix to prevent key list from scrolling to top when opening nav drawer
2014-08-14 18:51:35 +02:00
e1958009bd
Do not allow self certifying
2014-08-14 18:10:22 +02:00
9af301ec77
handle modify and save errors in KeychainIntentResult
2014-08-14 17:12:17 +02:00
eebd480e8d
Fix KeySpinner on cursor change
2014-08-14 16:14:16 +02:00
9ad09a3982
Automcomplete names and emails in keyserver tab
2014-08-14 16:12:42 +02:00
a6118877ff
Add and use CertifyKeySpinner
2014-08-14 16:02:28 +02:00
07d6a26778
add OnKeyChangedListener to KeySpinner
2014-08-14 16:02:27 +02:00
ef2449917e
factor KeySpinner out
2014-08-14 16:02:27 +02:00
225e248293
Remove MD5 support
2014-08-14 15:30:08 +02:00
e72e47d92e
Remove support for v3 sig generation
2014-08-14 15:24:37 +02:00
d0987edab9
Dont write version header by default
2014-08-14 11:44:47 +02:00
f941431d63
Add user info dialog
2014-08-13 21:49:04 +02:00
38da2af0e8
Better error handling for passphrase cache if key is missing
2014-08-13 16:37:28 +02:00
f34597a3c0
remove bundle for symmetric/asymmetric fragment as it was useless
2014-08-13 13:02:30 +02:00
e8b7bbd978
fix message and uri from encrypt intent
2014-08-13 12:48:02 +02:00
82a41a2f7c
Only show relevant keys in encrypt, fix #756 #757
2014-08-12 13:56:30 +02:00
4fdf9ab486
Only show keyrings that have a valid sign key in from field, fixes #756
2014-08-12 12:57:08 +02:00
abf50c3750
Support mime type in metadata
2014-08-11 20:16:21 +02:00
b673565035
Get original filename for decryption
2014-08-11 17:10:47 +02:00
1abae04cda
Fix compression setting for encryption of files
2014-08-10 20:27:34 +02:00
bac767d184
Edit key: prevent the combination of change to primary user id and revocation
2014-08-07 08:51:56 +02:00
e4974ac409
Use CompressionAlgorithmTags instead of homebrew constants
2014-08-05 23:50:59 +02:00
f4802157dd
Optimize imports
2014-08-05 22:46:00 +02:00
6354b2dcf9
Increase maximum custom RSA size
2014-08-05 22:38:36 +02:00
1455af2eed
Edit key: key flags
2014-08-05 22:35:37 +02:00
f8a222983e
Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry selection for adding new subkeys
2014-08-05 20:52:29 +02:00
39380a3617
More work on add subkey dialog design
2014-08-05 18:42:55 +02:00
04cdd45e1a
Work on add subkey dialog design
2014-08-05 18:35:48 +02:00
d377d1f23d
Better handling of user id revocation in UI code
2014-08-05 17:59:05 +02:00
160e6972d8
Create key: make single user id primary user id, other cleanup
2014-08-05 17:25:22 +02:00
369f6e080c
Refactor expiry dialog
2014-08-05 15:07:11 +02:00
80408460a0
KeychainContract: use longs instead of String, other fixes
2014-08-05 00:23:04 +02:00
ce8d38d9b3
Add license headers
2014-08-04 16:46:23 +02:00
7eafd77e15
Fix nullpointer, remove unused window feature
2014-08-04 16:37:42 +02:00
a2c1221397
Fixing lint complaints, removing unused resources
2014-08-04 16:29:16 +02:00
3a6ac2a16a
More cleanup
2014-08-04 15:49:49 +02:00
e87c69647c
Even more smaller nitpicks
2014-08-04 15:40:34 +02:00
839294d27c
Cleanup, prevent encrypt Intent inception
2014-08-04 14:42:03 +02:00
b42afcd32c
Fix debug backup/restore methods
2014-08-04 11:19:46 +02:00
fb5c829ff7
Remove old edit key stuff
2014-08-04 02:31:54 +02:00
7f463ae0df
Edit key: subkey adding, not finished
2014-08-04 02:26:34 +02:00
c39cf197f4
button language in encrypt
2014-08-04 00:54:57 +02:00
4979ccd645
Smaller UI fixes
2014-08-04 00:49:16 +02:00
c2ca841ac9
Merge pull request #728 from mar-v-in/improve-file-more
...
Improve file encrypt
2014-08-04 00:21:59 +02:00
d4f2d3842b
Minor cleanup
2014-08-02 04:16:26 +02:00
e17c1a0cd4
Fix focusing with To field
2014-08-02 00:52:34 +02:00
9d101b4fe5
Encrypt UI (drop downs)
2014-08-01 23:30:31 +02:00
f72a07690c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-01 17:54:10 +02:00
c9b028804c
Add user id with dialog
2014-08-01 17:47:07 +02:00
c0edaf9a5e
make FileImportCache generic, iterable, and add unit test
2014-08-01 16:59:48 +02:00
b206b6d351
Cache input file thumbnail.
2014-08-01 12:41:30 +02:00
3a13cd5e4d
Fix first key is not used erroneously
2014-08-01 12:23:31 +02:00
00f5352ddc
Fixes after merge
2014-08-01 05:31:04 +02:00
fc2a1f5838
Merge branch 'master' into improve-file-more
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
2014-08-01 05:29:40 +02:00
79f69f2fce
Start fixing CachedPublicKeyRing
2014-08-01 00:38:36 +02:00
a25ca5429f
Certifying instead of signing
2014-08-01 00:22:15 +02:00
a86b1d92f8
Use darker colors
2014-08-01 00:18:29 +02:00
afe56e08fe
Show file tab only for import of existing keys
2014-08-01 00:10:01 +02:00
08ae9db4ee
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-31 23:54:11 +02:00
55b764eb1d
Show revoked and expired for private keys
2014-07-31 23:54:02 +02:00
3d7cdf5428
move upload/update buttons from menu to buttons
2014-07-31 23:49:53 +02:00
c71cdc1432
Fix string resources
2014-07-31 23:36:37 +02:00
97209f9d3d
Fixes for upload
2014-07-31 23:31:09 +02:00
36d8c9f608
Fix merge
2014-07-31 23:20:43 +02:00
eae7c711a3
Merge branch 'master' into improve-file-more
...
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
2014-07-31 23:19:01 +02:00
38120ae77c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-31 23:13:33 +02:00
db70fcfdbf
Create key: design fixes
2014-07-31 23:13:29 +02:00
caad5d1fc1
fix bug in UploadKeyActivity, minor work on uri handling
2014-07-31 23:07:20 +02:00
0c7eea225b
- add multi select for storage api (kitkat)
...
- UI fixes
- refactoring
2014-07-31 22:21:46 +02:00
50aea621ba
Fix animations in create key
2014-07-31 21:51:35 +02:00
138d5a1d9c
Robots like coffee too...
2014-07-31 21:18:24 +02:00
7bbe869c88
Parcelable data over 1MB can not be send through binder, parcel into a cache file, fix #592
2014-07-31 20:38:06 +02:00
279ddf7cbe
Handle result in create key
2014-07-31 19:19:11 +02:00
80f9c769c0
Keyserver exception translateable
2014-07-31 19:05:09 +02:00
ecb2c2c2b1
reduce memory usage while parsing multiple keyrings from a stream
2014-07-31 18:25:46 +02:00
33172d598d
couple of logging fixes
2014-07-31 17:09:30 +02:00
b156a057e8
rename Wrapped*Key* to Canonicalized*Key*
2014-07-31 17:09:30 +02:00
9475285013
Better exception handling for import of keys
2014-07-31 17:11:06 +02:00
1d2c93ca8a
More file association hacks for AndroidManifest and key import
2014-07-31 16:15:36 +02:00
65488cbf05
Create key: work on upload
2014-07-30 17:47:17 +02:00
fcc535a573
Create key: repeat passphrase
2014-07-30 15:29:01 +02:00
052cdfa392
Create key: upload
2014-07-30 15:19:33 +02:00
70bfb5c586
return values for create key
2014-07-30 14:57:59 +02:00
9f9aa79066
Fix conflicts
2014-07-30 01:07:10 +02:00
43b8170a44
Merge branch 'master' of github.com:open-keychain/open-keychain
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
2014-07-30 00:58:28 +02:00
6448de8f6a
Create key with fragments
2014-07-30 00:50:53 +02:00
4457b4a24c
fix a couple remaining AppMsgs
2014-07-29 14:00:36 +02:00
377d0f09fa
Merge branch 'ditch-appmsg'
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
2014-07-29 13:53:18 +02:00
ed6a89f35c
Use new icons in other key related activites, delete old icons
2014-07-28 16:10:36 +02:00
23689da56d
Use verified icon for certify action
2014-07-28 12:24:40 +02:00
730f820c8c
Set visibility at last
2014-07-28 11:17:12 +02:00
3d6edd1190
Use icons in key view
2014-07-28 11:11:23 +02:00
a3045c710e
Use new status icons in key list
2014-07-28 09:34:57 +02:00
0c3b2a6ed4
Smaller status images, green test
2014-07-28 09:10:45 +02:00
b2f7e839e1
Fix resource names, add small test
2014-07-28 01:23:38 +02:00
7e8b056574
cleanup left-overs
2014-07-27 21:44:00 +02:00
5974dccbea
Redesigned QR Code view
2014-07-27 21:40:43 +02:00
0f87b81158
Load QR Code asynchronously and with a fade in animation
2014-07-27 20:58:25 +02:00
57d9c7a013
Open keyboard on passphrase dialog, this should now work on all Android versions... hopefully
2014-07-27 20:42:39 +02:00
0403cbf11a
Prettify buttons
2014-07-27 18:12:14 +02:00
dab540e121
Work on first time wizard design
2014-07-27 17:56:52 +02:00
f4ee71e3ef
introduce EditKeyResult with transient UncachedKeyRing (half-baked!)
2014-07-27 01:22:10 +02:00
a8782272b3
some more work on supertoast and result parcel stuff
2014-07-27 00:46:38 +02:00
8132b9ac74
Merge branch 'master' into ditch-appmsg
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2014-07-26 23:06:32 +02:00
1e4f0c6b00
Make DecryptFragment abstract, as it should be
2014-07-25 13:39:54 +02:00
5eb414a22b
Program flow fixes
2014-07-25 01:34:29 +02:00
2913a78b18
Load of rework on EncryptActivity, still some TODOs
2014-07-20 17:09:34 +02:00
d63534d655
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
2014-07-16 18:49:16 +02:00
82af9672fd
Temporary program flow fixes
2014-07-16 10:07:50 +02:00
77d04a915b
Simple create key
2014-07-16 10:05:00 +02:00
57f5a788fd
Simple create key
2014-07-16 10:04:48 +02:00
c1c831e52b
New first time screen
2014-07-16 09:49:37 +02:00
d3c54d5f12
Fallback if no primary user id exists
2014-07-16 00:22:45 +02:00
64b87f75be
move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)
2014-07-15 19:47:52 +02:00
72237a0892
some fixes for edit
2014-07-15 19:22:40 +02:00
858fe47d46
Merge remote-tracking branch 'origin/master' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-07-15 17:39:36 +02:00
c101ee0240
Merge remote-tracking branch 'upstream/master' into feature-conceal-software
2014-07-13 15:39:16 +02:00
af5fddab7c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-12 21:04:57 +02:00
45dfb39749
more work on edit key
2014-07-12 20:39:23 +02:00
92c66743e0
Added Preference for concealing the PgpApplication
2014-07-12 19:19:12 +02:00
079194abe5
Fixed issues discussed in #713
2014-07-12 18:12:03 +02:00
cf40517eac
Implemented Notification, no fallback yet
2014-07-12 12:27:19 +02:00
54bc874ce5
Merge remote-tracking branch 'origin/master' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
1436ab8d90
SaveKeyringParcel: follow attribute m prefix coding guideline
2014-07-11 13:51:36 +02:00
daa1f5cf8e
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-08 03:34:53 +02:00
5adcb7885c
Work on subkeys adapter
2014-07-08 03:34:27 +02:00
2c62aa90c0
use SuperToast instead of AppMsg in code, part 1
2014-07-07 17:34:41 +02:00
d044daeedd
get rid of AppMsg library
2014-07-07 17:33:25 +02:00
ccb1579864
Prefer composition to inheritance is the mantra these das
2014-07-06 15:23:39 +01:00
fdf6411d5f
Merge branch 'master' into improve-file-more
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/res/layout/encrypt_content.xml
2014-07-06 02:24:34 +02:00
1b0666e9de
Many changes to file ... and still incomplete
...
- Multi file
- Reworked UI
2014-07-06 02:10:35 +02:00
709196f774
Use strings in edit key
2014-07-03 16:49:25 +02:00
1ba41e7482
Remove old edit button, rename activities
2014-07-03 16:21:16 +02:00
bd7b4ccf2b
cleanup, debug for passphrase set
2014-07-03 15:58:03 +02:00
6ca9d8a268
fix no passphrase check
2014-07-03 15:54:07 +02:00
Vincent Breitmoser