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

use temporary db for external content provider queries

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-05 20:13:58 +02:00
parent 69182df88c
commit eda75276ce
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@ import android.content.Context;
import android.database.Cursor; import android.database.Cursor;
import android.database.SQLException; import android.database.SQLException;
import android.database.sqlite.SQLiteException; import android.database.sqlite.SQLiteException;
import android.support.annotation.VisibleForTesting;
import org.sufficientlysecure.keychain.daos.LocalSecretKeyStorage; import org.sufficientlysecure.keychain.daos.LocalSecretKeyStorage;
import org.sufficientlysecure.keychain.provider.KeychainContract.CertsColumns; import org.sufficientlysecure.keychain.provider.KeychainContract.CertsColumns;
@@ -64,6 +63,10 @@ public class KeychainDatabase {
return sInstance; return sInstance;
} }
public static KeychainDatabase getTemporaryInstance(Context context) {
return new KeychainDatabase(context.getApplicationContext());
}
public interface Tables { public interface Tables {
String KEY_RINGS_PUBLIC = "keyrings_public"; String KEY_RINGS_PUBLIC = "keyrings_public";
String KEYS = "keys"; String KEYS = "keys";

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/KeychainExternalProvider.java
View File

@@ -134,7 +134,7 @@ public class KeychainExternalProvider extends ContentProvider {
String groupBy = null; String groupBy = null;
SupportSQLiteDatabase db = KeychainDatabase.getInstance(getContext()).getReadableDatabase(); SupportSQLiteDatabase db = KeychainDatabase.getTemporaryInstance(getContext()).getReadableDatabase();
String callingPackageName = apiPermissionHelper.getCurrentCallingPackage(); String callingPackageName = apiPermissionHelper.getCurrentCallingPackage();