Merge remote-tracking branch 'origin/master' into v/multi-decrypt

2015-06-26 02:44:59 +02:00
parent a990044fd9 51d35c7a83
commit dce4503ac5
23 changed files with 461 additions and 198 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
@@ -430,6 +430,9 @@ public class KeychainDatabase extends SQLiteOpenHelper {
    // DANGEROUS, use in test code ONLY!
    public void clearDatabase() {
        getWritableDatabase().execSQL("delete from " + Tables.KEY_RINGS_PUBLIC);
+        getWritableDatabase().execSQL("delete from " + Tables.API_ACCOUNTS);
+        getWritableDatabase().execSQL("delete from " + Tables.API_ALLOWED_KEYS);
+        getWritableDatabase().execSQL("delete from " + Tables.API_APPS);
    }

 }