[app] remove old ContentProviders from old database implementation

This commit is contained in:
Torsten Grote
2022-06-15 14:57:26 -03:00
committed by Hans-Christoph Steiner
parent a783d3cb94
commit 7a1d288792
36 changed files with 49 additions and 7360 deletions

View File

@@ -6,7 +6,7 @@ import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@Implements(App.class)
public class ShadowApp extends ValueObject {
public class ShadowApp {
@Implementation
protected static int[] getMinTargetMaxSdkVersions(Context context, String packageName) {

View File

@@ -1,7 +1,6 @@
package org.fdroid.fdroid.updater;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.pm.ApplicationInfo;
@@ -16,8 +15,6 @@ import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.DBHelper;
import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.data.RepoProvider;
import org.fdroid.fdroid.data.Schema;
import org.fdroid.fdroid.data.ShadowApp;
import org.fdroid.fdroid.nearby.LocalHTTPD;
import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
@@ -77,11 +74,6 @@ public class SwapRepoTest {
Preferences.setupForTests(context);
}
@After
public final void tearDownBase() {
DBHelper.clearDbHelperSingleton();
}
/**
* @see WifiStateChangeService.WifiInfoThread#run()
*/
@@ -143,15 +135,15 @@ public class SwapRepoTest {
//updater.processDownloadedFile(indexJarFile);
boolean foundRepo = false;
for (Repo repoFromDb : RepoProvider.Helper.all(context)) {
if (TextUtils.equals(repo.address, repoFromDb.address)) {
foundRepo = true;
repo = repoFromDb;
}
}
//for (Repo repoFromDb : RepoProvider.Helper.all(context)) {
// if (TextUtils.equals(repo.address, repoFromDb.address)) {
// foundRepo = true;
// repo = repoFromDb;
// }
//}
assertTrue(foundRepo);
assertNotEquals(-1, repo.getId());
//assertNotEquals(-1, repo.getId());
//List<Apk> apks = ApkProvider.Helper.findByRepo(context, repo, Schema.ApkTable.Cols.ALL);
//assertEquals(1, apks.size());
//for (Apk apk : apks) {
@@ -171,11 +163,9 @@ public class SwapRepoTest {
* that ensures it includes the primary key from the database.
*/
static Repo createRepo(String name, String uri, Context context, String signingCert) {
ContentValues values = new ContentValues(3);
values.put(Schema.RepoTable.Cols.SIGNING_CERT, signingCert);
values.put(Schema.RepoTable.Cols.ADDRESS, uri);
values.put(Schema.RepoTable.Cols.NAME, name);
RepoProvider.Helper.insert(context, values);
return RepoProvider.Helper.findByAddress(context, uri);
//values.put(Schema.RepoTable.Cols.SIGNING_CERT, signingCert);
//values.put(Schema.RepoTable.Cols.ADDRESS, uri);
//values.put(Schema.RepoTable.Cols.NAME, name);
return new Repo();
}
}