mar-v-in
2913a78b18
Load of rework on EncryptActivity, still some TODOs
2014-07-20 17:09:34 +02:00
mar-v-in
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
mar-v-in
1b0666e9de
Many changes to file ... and still incomplete
...
- Multi file
- Reworked UI
2014-07-06 02:10:35 +02:00
Dominik Schürmann
3363507be4
Bett API string
2014-07-04 09:52:25 +02:00
Dominik Schürmann
709196f774
Use strings in edit key
2014-07-03 16:49:25 +02:00
Dominik Schürmann
e006d4762c
Pull from transifex
2014-07-03 16:38:22 +02:00
Dominik Schürmann
9e56e53cf1
Pull from transifex
2014-07-03 16:30:41 +02:00
Dominik Schürmann
3085f0d229
Small strings fix
2014-07-03 16:24:10 +02:00
Dominik Schürmann
1ba41e7482
Remove old edit button, rename activities
2014-07-03 16:21:16 +02:00
Dominik Schürmann
bd7b4ccf2b
cleanup, debug for passphrase set
2014-07-03 15:58:03 +02:00
Dominik Schürmann
6ca9d8a268
fix no passphrase check
2014-07-03 15:54:07 +02:00
Dominik Schürmann
b9d2ae938a
Cache passphrase for edit
2014-07-03 15:49:46 +02:00
Dominik Schürmann
2988ac6e7b
Cache passphrase for edit
2014-07-03 15:48:46 +02:00
Dominik Schürmann
85dde66804
parcel newPassphrase
2014-07-03 15:28:45 +02:00
Dominik Schürmann
9cbf78f7ad
cleanup
2014-07-03 15:24:04 +02:00
Dominik Schürmann
42cc8b687b
edit key: subkey adapter
2014-07-03 15:14:06 +02:00
Dominik Schürmann
55f067b063
Work on edit
2014-07-03 15:06:05 +02:00
Dominik Schürmann
8cbdf7b1c5
smaller dropdown items
2014-07-03 08:48:33 +02:00
mar-v-in
51a4b0466b
Add support for multiple input/output URIs to KeychainIntentService
2014-07-03 00:34:41 +02:00
Dominik Schürmann
3512ac7199
Remove unnecessary error logs
2014-07-02 20:53:16 +02:00
Dominik Schürmann
12db94abca
A little bit less purple
2014-07-02 18:59:23 +02:00
Dominik Schürmann
d967c5d864
merge KeychainIntentService
2014-07-02 16:49:21 +02:00
Dominik Schürmann
13a13829a8
fix nullpointer, cleanup
2014-07-02 16:47:12 +02:00
Dominik Schürmann
94a58f3aa8
remove init methods from adapter
2014-07-02 16:33:30 +02:00
Vincent Breitmoser
a920f9ce0c
Merge remote-tracking branch 'origin/master'
2014-07-02 16:05:58 +02:00
Vincent Breitmoser
100b5f4c5f
Merge branch 'create-keyring'
2014-07-02 16:05:28 +02:00
Vincent Breitmoser
ebcd243e97
support changing primary user id in SaveKeyringParcel
...
Closes #695
2014-07-02 16:02:56 +02:00
Dominik Schürmann
3d34eb8ca4
edit key: work on saving
2014-07-02 15:42:38 +02:00
Dominik Schürmann
a66c6b5b7a
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-02 15:11:13 +02:00
Dominik Schürmann
4f83a4f163
Edit key: adding user ids
2014-07-02 15:10:50 +02:00
Vincent Breitmoser
6f558add35
use expert create key for key creation testing (revert this later on!)
2014-07-02 15:05:02 +02:00
Vincent Breitmoser
9fb92c8642
fix subkey addition
2014-07-02 15:03:28 +02:00
Vincent Breitmoser
144a10a3d0
forgot a line in previous commit
2014-07-02 14:53:25 +02:00
Vincent Breitmoser
287b74885e
don't use zero plural string for english
...
closes #703
2014-07-02 14:51:11 +02:00
mar-v-in
93eae114ea
Encrypt/Decrypt UI work
2014-07-02 00:34:21 +02:00
mar-v-in
3564773410
Add temporary file storage as discussed in #665
...
Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned.
2014-07-01 14:50:15 +02:00
Dominik Schürmann
7408a35e19
edit key: part 3
2014-07-01 12:36:02 +02:00
mar-v-in
50e72b196f
Missing import after merge
2014-07-01 01:26:50 +02:00
mar-v-in
d1d414c006
Merge branch 'master' into improve-file-more
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
2014-07-01 00:15:30 +02:00
Dominik Schürmann
a901004588
remove leftover of AndroidBootstrap
2014-06-30 22:05:02 +02:00
Dominik Schürmann
7c84b1fffd
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-06-30 22:01:25 +02:00
Dominik Schürmann
c2ba7e2420
work on edit key
2014-06-30 22:01:17 +02:00
Daniel Albert
5dcbc07af9
Fixed Bootstrap resource
2014-06-30 21:32:40 +02:00
Daniel Albert
cc095a2098
(should have) fixed Travis builds
2014-06-30 21:24:31 +02:00
Daniel Albert
f3b68a9932
Deprecated Android Bootstrap, thus fixing #597
2014-06-30 19:18:20 +02:00
Daniel Albert
158d19a945
Fixed, issue #702
2014-06-30 19:13:09 +02:00
Daniel Albert
df9af316b4
Merge branch 'master' of https://github.com/open-keychain/open-keychain
2014-06-30 19:09:56 +02:00
Daniel Albert
1e9789f5b4
Converted all other buttons
2014-06-30 19:09:13 +02:00
Vincent Breitmoser
de698b8955
add create key capabilities to SaveKeyringParcel
2014-06-29 22:34:53 +02:00
Daniel Albert
2406842847
Ported even more buttons to use new design (Key and User editor)
...
Added drawables for them
2014-06-29 22:31:37 +02:00