moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor code cleanup

This commit is contained in:
Dominik Schürmann 2014-11-21 12:41:39 +01:00
parent a798d95411
commit fc32f5f9d4
7 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
View File

@ -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 (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
if (!Constants.Path.APP_DIR.exists() && !Constants.Path.APP_DIR.mkdirs()) { if (!Constants.Path.APP_DIR.exists() && !Constants.Path.APP_DIR.mkdirs()) {
// ignore this for now, it's not crucial // ignore this for now, it's not crucial

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
View File

@ -330,7 +330,7 @@ public class UncachedKeyRing {
} }
if (cert.isLocal()) { 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); log.add(LogType.MSG_KC_REVOKE_BAD_LOCAL, indent);
modified = PGPPublicKey.removeCertification(modified, zert); modified = PGPPublicKey.removeCertification(modified, zert);
badCerts += 1; badCerts += 1;

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
View File

@ -78,7 +78,7 @@ import java.util.Iterator;
import java.util.concurrent.atomic.AtomicBoolean; 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 * data from the activities or other apps, queues these intents, executes them, and stops itself
* after doing them. * after doing them.
*/ */

16
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ShareHelper.java
View File

@ -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> * 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/>. * 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 android.os.Parcelable;
import java.util.ArrayList; 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/> * <p/>
* Put together from some stackoverflow posts... * Put together from some stackoverflow posts...
*/ */

2
extern/KeybaseLib vendored

@ -1 +1 @@
Subproject commit 70c2f33e26d3988a23524935810bcfe754b85a6f Subproject commit 7f4980f0789d7bb3c2124080f32b3bec703c576e

2
extern/minidns vendored

@ -1 +1 @@
Subproject commit 9e42bff01440c1351946a432126d5a1b87fb7c78 Subproject commit 118fefcaaa44a7f31f5c18fa7e477f1665f654b6

1
tools/suppressions.xml
View File

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