cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into keybase-proofs

Browse Source
This commit is contained in:
Dominik Schürmann
2014-11-21 23:55:17 +01:00
parent 629d83a1ce a805069c59
commit 47caad3edb
9 changed files with 34 additions and 45 deletions
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 (!Constants.Path.APP_DIR.exists() && !Constants.Path.APP_DIR.mkdirs()) {
// 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()) {
// 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;

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

@@ -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);
}
}

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>
*
@@ -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...
*/