f8e2dd681b
Update plugin to 1.0
2014-12-12 14:31:41 +01:00
e41dcd3795
Update for Android Studio 1.0 RC
2014-12-04 19:07:38 +01:00
2d992f19f7
Update safeslinger lib
2014-10-25 02:39:03 +02:00
1ec10ec894
Update safeslinger lib
2014-10-07 16:39:19 +02:00
2c22a4c2f6
Update safeslinger lib
2014-10-03 02:28:01 +02:00
0a546a3555
Update safeslinger lib
2014-09-24 11:34:04 +02:00
a59584f230
Removed submodule openpgp-card-nfc-lib
2014-09-24 02:10:04 +02:00
b373c866e7
Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate
2014-09-24 02:01:53 +02:00
0335b99516
update keybase lib
2014-09-21 09:28:38 +02:00
a8f7bd49e3
Update libs
2014-09-15 10:22:47 +02:00
2a6774b221
merge: add support for s2k dummy generation
...
if a public key gets merged into a secret one, and there are new
subkeys, the merge() routine now adds a newly generated, stripped secret
subkey instead.
2014-09-11 22:45:35 +02:00
c344158c37
Yubikey decryption works now
2014-09-09 08:52:25 +02:00
eecf4f655b
Unify package name
2014-09-08 22:34:43 +02:00
854679dc35
Update nfc lib
2014-09-08 22:28:21 +02:00
11b9ed2b74
Update libs
2014-09-08 14:09:28 +02:00
f4592c8b95
Yubikey: use PIN
2014-09-08 00:40:50 +02:00
83af19de20
Prepare Yubikey decryption
2014-09-08 00:01:29 +02:00
bb0d04de82
Fix for user ids in API
2014-09-07 20:09:36 +02:00
cfe20d89ea
Update API lib
2014-09-07 19:23:55 +02:00
857fc43873
Update and fix Intent API
2014-09-07 18:50:58 +02:00
a9644cab07
Update Intent API
2014-09-07 18:31:52 +02:00
e40dc48da3
Update safeslinger lib
2014-09-04 20:54:48 +02:00
10e96dff43
Add safeslinger to build
2014-09-04 11:30:36 +02:00
dece50244b
Add safeslinger submodule
2014-09-04 11:23:23 +02:00
40e6b24b14
Prepare API for OpenPgpSignatureResult extensions
2014-08-31 23:50:04 +02:00
456aa00e2a
Update TokenAutoComplete
2014-08-29 18:49:55 +02:00
aeb0296572
Update nfc lib
2014-08-28 11:05:52 +02:00
c0ebc92611
Merge branch 'master' into yubikey
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2014-08-28 11:00:18 +02:00
08bdb0c5b9
update to tidy spongy-master
2014-08-23 11:59:21 +02:00
aa35f6cffb
Fixing build with Spongy Castle 1.51
2014-08-21 15:20:49 +02:00
602fd546f7
Update spongy castle, not building...
2014-08-21 15:12:25 +02:00
d26c6b1a08
Update keybase lib
2014-08-20 09:20:30 +02:00
bc76941bc1
Fix sticky list headers lib, fix travis
2014-08-14 19:30:59 +02:00
110f8c4d52
Update sticky list headers
2014-08-14 17:00:36 +02:00
ad69e47cec
Support for multiple hash algos
2014-08-14 14:50:13 +02:00
6da17ef6bb
Merge branch 'master' into yubikey
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
2014-08-14 13:31:01 +02:00
d0987edab9
Dont write version header by default
2014-08-14 11:44:47 +02:00
9682826193
update api lib
2014-08-12 15:51:29 +02:00
a4a6314041
Fix API version support, update api lib
2014-08-12 13:54:46 +02:00
ae5e75f4e1
Implement EXTRA_ORIGINAL_FILENAME for API
2014-08-11 23:57:11 +02:00
acf5b99434
Update api lib
2014-08-11 21:26:52 +02:00
55d03f539e
update api lib
2014-08-11 20:16:56 +02:00
82e66cd5b8
Update api lib
2014-08-11 17:19:58 +02:00
881a50207a
Merge branch 'master' into yubikey
...
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
extern/openpgp-api-lib
settings.gradle
2014-08-06 01:08:12 +02:00
de6950377c
Lint fixes
2014-08-04 17:10:56 +02:00
da163c8d3d
TokenAutoComplete: Do not abort build if lint finds errors
2014-08-04 02:37:41 +02:00
e10cbc54c6
Merge branch 'master' into yubikey
...
Conflicts:
.gitmodules
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
2014-08-01 11:09:25 +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
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
ee307cdf28
Update gradle plugin to 0.12.2
2014-07-27 18:28:54 +02:00
cb3425f947
Update spongycastle
2014-07-27 18:21:39 +02:00
dab540e121
Work on first time wizard design
2014-07-27 17:56:52 +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
043ed600e6
Merge remote-tracking branch 'origin/master'
2014-07-26 03:59:12 +02:00
7fe1b00080
fixes for extractPublicKeyRing, update SpongyCastle
2014-07-26 03:56:28 +02:00
9ea5148550
Update libs
2014-07-25 01:34:57 +02:00
bef3e62111
update lib
2014-07-22 18:30:21 +02:00
878b5eb5ad
Add values for NFC support
2014-07-22 18:10:22 +02:00
99af2c33d3
Reuse signature creation timestamp for synchronous signing
2014-07-22 18:09:12 +02:00
976b232946
update nfc lib
2014-07-21 15:11:30 +02:00
d882572f0d
NFC Yubikey: only pass through hash of message and not whole content
2014-07-21 15:10:29 +02:00
cd1511a4e6
canonicalize: fix for tests
2014-07-19 02:19:15 +02:00
3d74a9c11c
Add OpenPGP-Haskell test files directly
2014-07-18 09:34:54 +02:00
69c38c3f34
Update lib
2014-07-17 21:14:42 +02:00
45611a33fb
Update libs
2014-07-17 20:30:41 +02:00
f2a6064e38
Fixes
2014-07-17 20:29:07 +02:00
3cce00d61e
add lib dependency, update lib
2014-07-16 11:00:32 +02:00
e531da4036
Add nfc lib
2014-07-16 10:22:51 +02:00
d044daeedd
get rid of AppMsg library
2014-07-07 17:33:25 +02: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
931bfdd9df
Update spongycastle
2014-07-02 16:56:38 +02:00
9c1c51bf0c
Removed submodule AndroidBootstrap
2014-06-30 22:04:13 +02:00
97e1f365c2
Update keybase lib
2014-06-28 20:44:01 +02:00
17aa5d1a90
Fix supertoast submodule
2014-06-28 20:24:02 +02:00
70bf0c67e1
Update git submodules for android gradle plugin to 0.12.0
2014-06-28 20:17:27 +02:00
b7b22beafc
Update subnodule keybase to fixed version of support libs
2014-06-28 18:59:07 +02:00
6c42fe58bd
Add minidns submodule
2014-06-23 21:46:17 +02:00
2cd4f7eb93
Remove dnsjava module
2014-06-23 21:44:49 +02:00
012b895e4f
Update lib
2014-06-22 12:03:40 +02:00
1e72f2cba5
Committed submodule
2014-06-21 10:32:11 -07:00
17f43ad21b
Moved Keybase stuff into KeybaseLib submodule
2014-06-20 09:31:34 -07:00
3bffe4da55
generate public keyring from secret if not available
2014-06-18 20:55:44 +02:00
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
97c679ada3
import-log: add SuperToast external library
2014-06-10 01:24:58 +02:00
fe1b8468a1
Update buildTools to 19.1
2014-06-09 21:55:32 +02:00
36312b950a
Add dnsjava as submodule
2014-06-05 23:46:14 +02:00
80779defb1
spongycastle: expose pskr constructor
2014-06-02 18:48:46 +02:00
638554f256
Update html-textview
2014-05-14 11:02:30 +02:00
be46eabdb5
Add pgpauth app to help, update html-textview
2014-05-13 18:52:48 +02:00
b4a9d1a2db
Add applications section to help
2014-05-07 18:31:31 +02:00
b817a0a2a8
Update submodules
2014-05-07 17:02:10 +02:00
ab1b2df2d6
Move API libs and API example into their own git repos
2014-05-07 16:51:06 +02:00
f7c243564f
Use git submodules for libs, fix compilation, remove library sourcecode
2014-04-16 21:49:29 +02:00
Dominik Schürmann