Daniel Albert
|
e375cde7e1
|
Final Commit for #662
|
2014-07-16 18:17:46 +02:00 |
|
Daniel Albert
|
c101ee0240
|
Merge remote-tracking branch 'upstream/master' into feature-conceal-software
|
2014-07-13 15:39:16 +02:00 |
|
Dominik Schürmann
|
0ce9c13132
|
Fix strings from 'keys' to 'passphrases'
|
2014-07-12 21:07:29 +02:00 |
|
Dominik Schürmann
|
af5fddab7c
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-07-12 21:04:57 +02:00 |
|
Dominik Schürmann
|
195f2c25cc
|
Merge pull request #713 from da-kid/master
Added notification to passphrasecache
|
2014-07-12 21:02:19 +02:00 |
|
Dominik Schürmann
|
45dfb39749
|
more work on edit key
|
2014-07-12 20:39:23 +02:00 |
|
Daniel Albert
|
bd909375c2
|
Fixed misplaced bracket
|
2014-07-12 19:24:51 +02:00 |
|
Daniel Albert
|
92c66743e0
|
Added Preference for concealing the PgpApplication
|
2014-07-12 19:19:12 +02:00 |
|
Daniel Albert
|
066591dab1
|
Wello there, That's Java, not C^^
|
2014-07-12 18:53:52 +02:00 |
|
Daniel Albert
|
079194abe5
|
Fixed issues discussed in #713
|
2014-07-12 18:12:03 +02:00 |
|
Daniel Albert
|
7a3fe61a1f
|
Put text into strings.xml, for internationalization
|
2014-07-12 12:52:44 +02:00 |
|
Daniel Albert
|
2568ea4b2e
|
Added Purging for Android < 4.1
|
2014-07-12 12:42:48 +02:00 |
|
Daniel Albert
|
cf40517eac
|
Implemented Notification, no fallback yet
|
2014-07-12 12:27:19 +02:00 |
|
Daniel Albert
|
af90db96a5
|
new PassphraseCache, storing UserIDs as well
|
2014-07-12 10:51:12 +02:00 |
|
Vincent
|
9fcc0a8816
|
Merge pull request #710 from mar-v-in/patch-1
Fix OperationResultParcel
|
2014-07-09 11:26:59 +02:00 |
|
mar-v-in
|
5185492b04
|
Fix OperationResultParcel
Naming conventions save lives... or atleast make addAll() work
|
2014-07-09 00:10:09 +02:00 |
|
Dominik Schürmann
|
16498be4a2
|
Fix nullpointer in API, fix #693
|
2014-07-08 04:24:27 +02:00 |
|
Dominik Schürmann
|
61d0e12e8a
|
cleanup
|
2014-07-08 03:37:32 +02:00 |
|
Dominik Schürmann
|
daa1f5cf8e
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-07-08 03:34:53 +02:00 |
|
Dominik Schürmann
|
5adcb7885c
|
Work on subkeys adapter
|
2014-07-08 03:34:27 +02:00 |
|
Vincent
|
fed11b2647
|
Merge pull request #708 from artbristol/composition-not-inheritance
Prefer composition to inheritance
|
2014-07-06 20:39:05 +02:00 |
|
Art O Cathain
|
ccb1579864
|
Prefer composition to inheritance is the mantra these das
|
2014-07-06 15:23:39 +01: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 |
|
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
|
931bfdd9df
|
Update spongycastle
|
2014-07-02 16:56:38 +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
|
bb39caa28d
|
Add infographic from FSFE
|
2014-07-02 15:11:06 +02:00 |
|
Dominik Schürmann
|
4f83a4f163
|
Edit key: adding user ids
|
2014-07-02 15:10:50 +02:00 |
|