moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 16:38:50 -05:00
Code Issues Releases Wiki Activity

consolidate: use KeychainProvider for deletion operation

Browse Source
This commit is contained in:
Vincent Breitmoser 2014-08-20 19:31:51 +02:00
parent 70426041df
commit 9aaaac068e
4 changed files with 7 additions and 5 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

@ -103,8 +103,6 @@ public class KeychainApplication extends Application {
} }
} }
public static void setupAccountAsNeeded(Context context) { public static void setupAccountAsNeeded(Context context) {
AccountManager manager = AccountManager.get(context); AccountManager manager = AccountManager.get(context);
Account[] accounts = manager.getAccountsByType(Constants.PACKAGE_NAME); Account[] accounts = manager.getAccountsByType(Constants.PACKAGE_NAME);

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

@ -349,7 +349,7 @@ public class KeychainDatabase extends SQLiteOpenHelper {
copy(in, out); copy(in, out);
} }
// DANGEROUS // DANGEROUS, use in test code ONLY!
public void clearDatabase() { public void clearDatabase() {
getWritableDatabase().execSQL("delete from " + Tables.KEY_RINGS_PUBLIC); getWritableDatabase().execSQL("delete from " + Tables.KEY_RINGS_PUBLIC);
} }

5
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
View File

@ -685,6 +685,11 @@ public class KeychainProvider extends ContentProvider {
final int match = mUriMatcher.match(uri); final int match = mUriMatcher.match(uri);
switch (match) { switch (match) {
// dangerous
case KEY_RINGS_UNIFIED: {
count = db.delete(Tables.KEY_RINGS_PUBLIC, null, null);
break;
}
case KEY_RING_PUBLIC: { case KEY_RING_PUBLIC: {
@SuppressWarnings("ConstantConditions") // ensured by uriMatcher above @SuppressWarnings("ConstantConditions") // ensured by uriMatcher above
String selection = KeyRings.MASTER_KEY_ID + " = " + uri.getPathSegments().get(1); String selection = KeyRings.MASTER_KEY_ID + " = " + uri.getPathSegments().get(1);

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@ -963,7 +963,6 @@ public class ProviderHelper {
private ConsolidateResult consolidateDatabaseStep2(Progressable progress, boolean recovery) { private ConsolidateResult consolidateDatabaseStep2(Progressable progress, boolean recovery) {
Preferences prefs = Preferences.getPreferences(mContext); Preferences prefs = Preferences.getPreferences(mContext);
// Set flag that we have a cached consolidation here // Set flag that we have a cached consolidation here
@ -986,7 +985,7 @@ public class ProviderHelper {
// 2. wipe database (IT'S DANGEROUS) // 2. wipe database (IT'S DANGEROUS)
log(LogLevel.DEBUG, LogType.MSG_CON_DB_CLEAR); log(LogLevel.DEBUG, LogType.MSG_CON_DB_CLEAR);
new KeychainDatabase(mContext).clearDatabase(); mContentResolver.delete(KeyRings.buildUnifiedKeyRingsUri(), null, null);
FileImportCache<ParcelableKeyRing> cacheSecret = FileImportCache<ParcelableKeyRing> cacheSecret =
new FileImportCache<ParcelableKeyRing>(mContext, "consolidate_secret.pcl"); new FileImportCache<ParcelableKeyRing>(mContext, "consolidate_secret.pcl");