From fc32f5f9d4a572a035d04f70a2f0930d78a088d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 21 Nov 2014 12:41:39 +0100 Subject: Minor code cleanup --- .../sufficientlysecure/keychain/KeychainApplication.java | 2 +- .../sufficientlysecure/keychain/pgp/UncachedKeyRing.java | 2 +- .../keychain/service/KeychainIntentService.java | 2 +- .../sufficientlysecure/keychain/util/ShareHelper.java | 16 ++++++++-------- extern/KeybaseLib | 2 +- extern/minidns | 2 +- tools/suppressions.xml | 1 - 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index cacceb5d0..446699a81 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -77,7 +77,7 @@ public class KeychainApplication extends Application { } */ - // Create APG directory on sdcard if not existing + // Create OpenKeychain directory on sdcard if not existing if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) { if (!Constants.Path.APP_DIR.exists() && !Constants.Path.APP_DIR.mkdirs()) { // ignore this for now, it's not crucial diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java index 8856da8b0..d05ce3d5c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -330,7 +330,7 @@ public class UncachedKeyRing { } if (cert.isLocal()) { - // Creation date in the future? No way! + // Remove revocation certs with "local" flag log.add(LogType.MSG_KC_REVOKE_BAD_LOCAL, indent); modified = PGPPublicKey.removeCertification(modified, zert); badCerts += 1; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index a2988f2b2..2911496a6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -78,7 +78,7 @@ import java.util.Iterator; import java.util.concurrent.atomic.AtomicBoolean; /** - * This Service contains all important long lasting operations for APG. It receives Intents with + * This Service contains all important long lasting operations for OpenKeychain. It receives Intents with * data from the activities or other apps, queues these intents, executes them, and stops itself * after doing them. */ diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java index 27f026f80..51e58565f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java @@ -1,10 +1,3 @@ -package org.sufficientlysecure.keychain.util; - -import android.content.Context; -import android.content.Intent; -import android.content.pm.LabeledIntent; -import android.content.pm.ResolveInfo; -import android.os.Build; /* * Copyright (C) 2014 Dominik Schürmann * @@ -22,6 +15,13 @@ import android.os.Build; * along with this program. If not, see . */ +package org.sufficientlysecure.keychain.util; + +import android.content.Context; +import android.content.Intent; +import android.content.pm.LabeledIntent; +import android.content.pm.ResolveInfo; +import android.os.Build; import android.os.Parcelable; import java.util.ArrayList; @@ -38,7 +38,7 @@ public class ShareHelper { } /** - * Create Intent Chooser but exclude OK's EncryptActivity. + * Create Intent Chooser but exclude specific activites, e.g., EncryptActivity to prevent encrypting again *

* Put together from some stackoverflow posts... */ diff --git a/extern/KeybaseLib b/extern/KeybaseLib index 70c2f33e2..7f4980f07 160000 --- a/extern/KeybaseLib +++ b/extern/KeybaseLib @@ -1 +1 @@ -Subproject commit 70c2f33e26d3988a23524935810bcfe754b85a6f +Subproject commit 7f4980f0789d7bb3c2124080f32b3bec703c576e diff --git a/extern/minidns b/extern/minidns index 9e42bff01..118fefcaa 160000 --- a/extern/minidns +++ b/extern/minidns @@ -1 +1 @@ -Subproject commit 9e42bff01440c1351946a432126d5a1b87fb7c78 +Subproject commit 118fefcaaa44a7f31f5c18fa7e477f1665f654b6 diff --git a/tools/suppressions.xml b/tools/suppressions.xml index 9173d3a5e..4d8fe5717 100644 --- a/tools/suppressions.xml +++ b/tools/suppressions.xml @@ -6,7 +6,6 @@ - -- cgit v1.2.3 From dd65d104064edc0487c5b3c656dc6ef3ee5eede9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 21 Nov 2014 13:31:43 +0100 Subject: NFC activity design --- OpenKeychain/src/main/res/drawable/yubikey_neo.png | Bin 132128 -> 0 bytes .../src/main/res/drawable/yubikey_phone.png | Bin 0 -> 352625 bytes OpenKeychain/src/main/res/layout/nfc_activity.xml | 24 ++++++++------------- OpenKeychain/src/main/res/values/strings.xml | 9 ++++---- 4 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 OpenKeychain/src/main/res/drawable/yubikey_neo.png create mode 100644 OpenKeychain/src/main/res/drawable/yubikey_phone.png diff --git a/OpenKeychain/src/main/res/drawable/yubikey_neo.png b/OpenKeychain/src/main/res/drawable/yubikey_neo.png deleted file mode 100644 index d4156eb5e..000000000 Binary files a/OpenKeychain/src/main/res/drawable/yubikey_neo.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable/yubikey_phone.png b/OpenKeychain/src/main/res/drawable/yubikey_phone.png new file mode 100644 index 000000000..6a03501c6 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable/yubikey_phone.png differ diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml index e78fa7c87..034b74a35 100644 --- a/OpenKeychain/src/main/res/layout/nfc_activity.xml +++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml @@ -1,30 +1,24 @@ - + android:paddingTop="16dp" + android:paddingBottom="16dp"> + android:src="@drawable/yubikey_phone" /> - + diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index e2b92d875..9ea16a0ab 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -115,9 +115,9 @@ "Enable ASCII Armor" "Let others know that you're using OpenKeychain" "Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys" - "Use default Yubikey PIN" - Use number keypad for Yubikey PIN - "Uses default PIN (123456) to access Yubikeys over NFC" + "Use default YubiKey PIN" + Use number keypad for YubiKey PIN + "Uses default PIN (123456) to access YubiKeys over NFC" "Signed by:" "Encrypt to:" "Delete file after encryption" @@ -205,7 +205,8 @@ "Please enter a passphrase." "Symmetric encryption." "Enter passphrase for '%s'" - "Enter PIN to access Yubikey for '%s'" + "Enter PIN to access YubiKey for '%s'" + "Hold YubiKey against the back of your device." "Are you sure you want to delete\n%s?" "Successfully deleted." "Select a file first." -- cgit v1.2.3 From a805069c59586775fd5790c00cbd82f4dfeddcb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Fri, 21 Nov 2014 23:55:04 +0100 Subject: more cleanup --- .../keychain/service/KeychainIntentService.java | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index 2911496a6..8c5050fdf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -155,7 +155,6 @@ public class KeychainIntentService extends IntentService implements Progressable public static final String IMPORT_KEY_SERVER = "import_key_server"; // export key - public static final String EXPORT_OUTPUT_STREAM = "export_output_stream"; public static final String EXPORT_FILENAME = "export_filename"; public static final String EXPORT_URI = "export_uri"; public static final String EXPORT_SECRET = "export_secret"; @@ -181,10 +180,6 @@ public class KeychainIntentService extends IntentService implements Progressable // decrypt/verify public static final String RESULT_DECRYPTED_BYTES = "decrypted_data"; - public static final String RESULT_DECRYPT_VERIFY_RESULT = "signature"; - - // export - public static final String RESULT_EXPORT = "exported"; Messenger mMessenger; @@ -712,15 +707,6 @@ public class KeychainIntentService extends IntentService implements Progressable } } - @Override - public int onStartCommand(Intent intent, int flags, int startId) { - if (ACTION_CANCEL.equals(intent.getAction())) { - mActionCanceled.set(true); - return START_NOT_STICKY; - } - return super.onStartCommand(intent, flags, startId); - } - private String getOriginalFilename(Bundle data) throws PgpGeneralException, FileNotFoundException { int target = data.getInt(TARGET); switch (target) { @@ -785,4 +771,13 @@ public class KeychainIntentService extends IntentService implements Progressable break; } } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + if (ACTION_CANCEL.equals(intent.getAction())) { + mActionCanceled.set(true); + return START_NOT_STICKY; + } + return super.onStartCommand(intent, flags, startId); + } } -- cgit v1.2.3