From 50af8b6889c1f39e27269425567374b379474a24 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 3 Apr 2018 01:26:25 +0200
Subject: [PATCH] Make api permissive operations idempotent

---
 .../keychain/provider/ApiDataAccessObject.java                | 3 +--
 .../keychain/provider/KeychainProvider.java                   | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ApiDataAccessObject.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ApiDataAccessObject.java
index c2a1ee642..ed33c1863 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ApiDataAccessObject.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ApiDataAccessObject.java
@@ -99,8 +99,7 @@ public class ApiDataAccessObject {
     }
 
     public void insertApiApp(AppSettings appSettings) {
-        mQueryInterface.insert(ApiApps.CONTENT_URI,
-                contentValueForApiApps(appSettings));
+        mQueryInterface.insert(ApiApps.CONTENT_URI, contentValueForApiApps(appSettings));
     }
 
     public void deleteApiApp(String packageName) {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
index bd5881eda..4dce0d44c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
@@ -944,7 +944,7 @@ public class KeychainProvider extends ContentProvider {
                     break;
                 }
                 case API_APPS: {
-                    db.insertOrThrow(Tables.API_APPS, null, values);
+                    db.insert(Tables.API_APPS, null, values);
                     break;
                 }
                 case API_ALLOWED_KEYS: {
@@ -953,7 +953,7 @@ public class KeychainProvider extends ContentProvider {
                     String packageName = uri.getPathSegments().get(1);
                     values.put(ApiAllowedKeys.PACKAGE_NAME, packageName);
 
-                    db.insertOrThrow(Tables.API_ALLOWED_KEYS, null, values);
+                    db.insert(Tables.API_ALLOWED_KEYS, null, values);
                     break;
                 }
                 default: {