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
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
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
Daniel Albert
e8bb14ca26
Converted AsymetricKeyFragment to new button style
2014-06-29 15:28:24 +02:00
Daniel Albert
9091c22240
Added new button style and converted account_settings and the select_secret_key_layout to use it
2014-06-29 13:59:51 +02:00
Daniel Albert
4beff43a83
Updated file_dialog to use the new buttons
2014-06-29 13:21:33 +02:00
Daniel Albert
e731dc139f
Improved button style
...
centered buttons
removed commented-out button
2014-06-29 12:33:02 +02:00
Daniel Albert
bd44516576
Added button_rounded style
...
converted decrypt_file_fragment to new style
2014-06-28 21:12:56 +02:00
Vincent Breitmoser
6d7a9ec48a
pass import results through to viewkeyactivity on update
2014-06-28 20:54:14 +02:00
Vincent Breitmoser
3acb7fb087
fix nullpointerexception in importkeyactivity
2014-06-28 20:54:13 +02:00
Vincent Breitmoser
d6a2875816
code cleanup and plurals in import log entries
...
closes #698
2014-06-28 19:15:28 +02:00
Daniel Albert
2da5bfabd3
Merge remote-tracking branch 'upstream/master'
2014-06-28 12:30:30 +02:00
Daniel Albert
d19c97a714
Switched to the dark icons
2014-06-28 12:25:41 +02:00
Dominik Schürmann
3f3e1cdb05
Magic to find possible mails and names of device owner
2014-06-28 00:05:12 +02:00
Dominik Schürmann
1d5606a1a3
More wizardry
2014-06-27 23:01:11 +02:00
Dominik Schürmann
8bfba0826f
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-06-27 21:40:26 +02:00
Dominik Schürmann
9fe07478e7
Start work on a first-time wizard
2014-06-27 21:40:18 +02:00
Daniel Albert
567e5cc6a5
Added unlock icon, fixed drawer items, switched to icons from resource in drawer
2014-06-27 21:03:19 +02:00
Daniel Albert
1b90b46b00
Swapped out FontawesomeText with normal ImageView
2014-06-26 21:33:42 +02:00
Daniel Albert
607af7bcca
Temporary fix for #648
2014-06-25 19:20:17 +02:00
Dominik Schürmann
150090852b
Merge pull request #690 from mar-v-in/hkps-by-default
...
HKPS by default
2014-06-25 08:48:40 +02:00
mar-v-in
f97ac83a89
Move sks-keyservers.net CA into assets folder
2014-06-25 00:37:01 +02:00
Dominik Schürmann
a1bcbe72a3
new edit key: first version to add user ids
2014-06-24 22:58:28 +02:00
Dominik Schürmann
94bd2a675e
Merge pull request #688 from da-kid/master
...
Fix for #687
2014-06-24 20:22:50 +02:00
Dominik Schürmann
9ce7d29a2d
Merge submodules
2014-06-24 20:16:46 +02:00
Daniel Albert
02bcd391bf
Fix for #687
2014-06-24 20:15:48 +02:00
Dominik Schürmann
e84aa5a69d
Rename registered apps to apps
2014-06-24 13:54:24 +02:00
mar-v-in
38823b73a3
Merge branch 'master' into improve-file-more
2014-06-24 11:35:59 +02:00
mar-v-in
997faac90e
Merge branch 'master' into hkps-by-default
2014-06-24 11:35:26 +02:00
mar-v-in
97de1592f0
Fix sks-keyservers.net sub pool
2014-06-24 11:27:35 +02:00
mar-v-in
04e64ac84e
Update Keyservers to use hkps as needed
2014-06-24 11:26:52 +02:00
mar-v-in
f039ef81ae
Use URLEncoder instead of Uri.encode
2014-06-24 01:31:06 +02:00
mar-v-in
9a7fc6d464
Rewrote hkp add to work with hkps as well.
...
Also removes HttpClient dependency (deprecated for android)
2014-06-24 00:57:04 +02:00
Vincent
c865de4002
Merge pull request #686 from mar-v-in/minidns
...
Use minidns instead of dnsjava
2014-06-23 23:16:25 +02:00
mar-v-in
e6629b53a2
Few fixes on hkps
...
TODO: Fix add as well
2014-06-23 22:46:59 +02:00
mar-v-in
3ebbaae253
Add hkps support for sks-keyservers.net
2014-06-23 22:27:58 +02:00
mar-v-in
b92a389ebc
Add TlsHelper (designed to be used with sks-keyservers.net)
...
We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
2014-06-23 22:26:02 +02:00
mar-v-in
2b18dc741a
Switch to dnsjava
2014-06-23 22:02:18 +02:00
Dominik Schürmann
804f811998
Merge pull request #684 from da-kid/master
...
Fix of #683
2014-06-23 19:35:27 +02:00
