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
1ba41e7482
Remove old edit button, rename activities
2014-07-03 16:21:16 +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
3f3e1cdb05
Magic to find possible mails and names of device owner
2014-06-28 00:05:12 +02:00
Dominik Schürmann
9fe07478e7
Start work on a first-time wizard
2014-06-27 21:40:18 +02:00
Dominik Schürmann
18430bef17
Start new designed activity
2014-06-21 20:25:51 +02:00
Dominik Schürmann
a246dc9675
Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions
2014-06-18 22:30:54 +02:00
Vincent Breitmoser
ca4774fd62
Merge remote-tracking branch 'origin/master' into canonicalize
...
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/res/values/strings.xml
settings.gradle
2014-06-13 00:27:40 +02:00
Vincent Breitmoser
7324bfcb53
import-log: add LogDisplay activity
2014-06-10 01:53:25 +02:00
mar-v-in
80e9998640
Show keys with android contacts
...
This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
2014-06-05 23:22:21 +02:00
mar-v-in
dd959876f4
First version of automatic contact discovery.
...
TODO:
- Configuration (much of it)
- Enabled by default?
- Which keys to import? Current state: All non-revoked and non-expired with matching userid
- Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?)
- Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
2014-06-04 18:05:16 +02:00
mar-v-in
7865b92285
ContactHelper can read email addresses from contact list
2014-05-26 20:24:13 +02:00
Dominik Schürmann
1daddfbaab
Version 2.7
2014-05-08 19:40:13 +02:00
Dominik Schürmann
e14ce09186
Better handling of actionbars back
2014-05-07 14:33:20 +02:00
Dominik Schürmann
3538bf8202
Version 2.6.1
2014-04-22 11:42:12 +02:00
Dominik Schürmann
0383822585
version 2.6
2014-04-19 16:02:40 +02:00
Dominik Schürmann
a4ae8a72ee
OK 2.6 RC1
2014-04-17 18:09:42 +02:00
Vincent Breitmoser
2a34d0e0e4
add up navigation in ViewCertActivity
...
Fixes #567
2014-04-17 15:30:16 +02:00
Dominik Schürmann
0be4f69860
Update comments in AndroidManifest
2014-04-17 13:55:46 +02:00
Dominik Schürmann
ab66b40883
Version 2.6 beta1
2014-04-16 12:30:37 +02:00
Dominik Schürmann
194523303f
Remove unused blob classes and other dead code
2014-04-13 17:46:39 +02:00
Dominik Schürmann
6d11371905
Rename folder structure from OpenPGP Keychain to OpenKeychain
2014-04-06 12:57:42 +02:00
