Merge branch 'development' into keybase-proofs

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

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;

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

@@ -92,7 +92,7 @@ import de.measite.minidns.record.Data;
 import de.measite.minidns.record.TXT;
 
 /**
- * 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.
  */
@@ -176,7 +176,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";
@@ -202,10 +201,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;
 
@@ -839,15 +834,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) {
@@ -912,4 +898,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);
+    }
 }

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 <dominik@dominikschuermann.de>
  *
@@ -22,6 +15,13 @@ import android.os.Build;
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+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
      * <p/>
      * Put together from some stackoverflow posts...
      */

OpenKeychain/src/main/res/layout/nfc_activity.xml

@@ -1,30 +1,24 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    android:background="#FFFFFFFF"
-    tools:context="org.sufficientlysecure.keychain.nfc.NfcActivityFull">
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp">
 
     <TextView
-        android:text="Hold Yubikey against the back of your device!"
+        android:text="@string/nfc_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="@android:style/TextAppearance.Large"
-        android:id="@+id/textView"
+        android:id="@+id/nfc_text"
         android:gravity="center"
         android:layout_gravity="center" />
 
     <ImageView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/imageView"
-        android:src="@drawable/yubikey_neo"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@+id/textView" />
+        android:src="@drawable/yubikey_phone" />
 
-</RelativeLayout>
+</LinearLayout>

OpenKeychain/src/main/res/values/strings.xml

@@ -118,9 +118,9 @@
     <string name="label_file_ascii_armor">"Enable ASCII Armor"</string>
     <string name="label_write_version_header">"Let others know that you're using OpenKeychain"</string>
     <string name="label_write_version_header_summary">"Writes 'OpenKeychain v2.7' to OpenPGP signatures, ciphertext, and exported keys"</string>
-    <string name="label_use_default_yubikey_pin">"Use default Yubikey PIN"</string>
-    <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for Yubikey PIN</string>
-    <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access Yubikeys over NFC"</string>
+    <string name="label_use_default_yubikey_pin">"Use default YubiKey PIN"</string>
+    <string name="label_use_num_keypad_for_yubikey_pin">Use number keypad for YubiKey PIN</string>
+    <string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access YubiKeys over NFC"</string>
     <string name="label_asymmetric_from">"Signed by:"</string>
     <string name="label_to">"Encrypt to:"</string>
     <string name="label_delete_after_encryption">"Delete file after encryption"</string>
@@ -208,7 +208,8 @@
     <string name="passphrase_must_not_be_empty">"Please enter a passphrase."</string>
     <string name="passphrase_for_symmetric_encryption">"Symmetric encryption."</string>
     <string name="passphrase_for">"Enter passphrase for '%s'"</string>
-    <string name="yubikey_pin">"Enter PIN to access Yubikey for '%s'"</string>
+    <string name="yubikey_pin">"Enter PIN to access YubiKey for '%s'"</string>
+    <string name="nfc_text">"Hold YubiKey against the back of your device."</string>
     <string name="file_delete_confirmation">"Are you sure you want to delete\n%s?"</string>
     <string name="file_delete_successful">"Successfully deleted."</string>
     <string name="no_file_selected">"Select a file first."</string>

tools/suppressions.xml

@@ -6,7 +6,6 @@
 
 <suppressions>
   <suppress files="(Constants|Id|R|PgpConversionHelper)\.java" checks=".*NameCheck"/>
-  <suppress files="Apg.java" checks="LineLength"/>
   <suppress files="FileDialog.java" checks="StaticVariableNameCheck"/>
   <suppress files="PRNGFixes.java" checks=".*"/>
 </suppressions>