aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-09 19:57:57 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-09 19:57:57 +0200
commit6d00ca7fdb305b43e0638d86558d1eba63d86e66 (patch)
treed56af0e5d6cfe296ee97f5bd32d21cd98f2bd1ce /OpenKeychain
parent21e6110b6ded9df4677ca950dee494c4cfc94b9b (diff)
downloadopen-keychain-6d00ca7fdb305b43e0638d86558d1eba63d86e66.tar.gz
open-keychain-6d00ca7fdb305b43e0638d86558d1eba63d86e66.tar.bz2
open-keychain-6d00ca7fdb305b43e0638d86558d1eba63d86e66.zip
Temporary disable of master key id extraction from uri
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 28376096d..3e0520c2a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -124,13 +124,13 @@ public class ProviderHelper {
*/
public static long getMasterKeyId(Context context, Uri queryUri) throws NotFoundException {
// try extracting from the uri first
- String firstSegment = queryUri.getPathSegments().get(1);
- if(!firstSegment.equals("find")) try {
- return Long.parseLong(firstSegment);
- } catch(NumberFormatException e) {
- // didn't work? oh well.
- Log.d(Constants.TAG, "Couldn't get masterKeyId from URI, querying...");
- }
+// String firstSegment = queryUri.getPathSegments().get(1);
+// if(!firstSegment.equals("find")) try {
+// return Long.parseLong(firstSegment);
+// } catch(NumberFormatException e) {
+// // didn't work? oh well.
+// Log.d(Constants.TAG, "Couldn't get masterKeyId from URI, querying...");
+// }
Object data = getGenericData(context, queryUri, KeyRings.MASTER_KEY_ID, FIELD_TYPE_INTEGER);
if(data != null) {
return (Long) data;