From fc32f5f9d4a572a035d04f70a2f0930d78a088d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
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 <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...
      */
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 @@
 
 <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>
-- 
cgit v1.2.3