mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-06-19 05:10:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add "preferredSigner" field to App.

Browse Source 
At present, this is chosen from the first package in the index-v1
metadata.
This commit is contained in:
Peter Serwylo
2017-06-21 15:48:21 +10:00
parent 6b42b802b3
commit caac895442
8 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/test/java/org/fdroid/fdroid/TestUtils.java
View File

@@ -92,10 +92,11 @@ public class TestUtils {
}
public static App insertApp(Context context, String packageName, String appName, int upstreamVersionCode,
Repo repo) {
Repo repo, String preferredSigner) {
ContentValues values = new ContentValues();
values.put(Schema.AppMetadataTable.Cols.REPO_ID, repo.getId());
values.put(Schema.AppMetadataTable.Cols.UPSTREAM_VERSION_CODE, upstreamVersionCode);
values.put(Schema.AppMetadataTable.Cols.PREFERRED_SIGNER, preferredSigner);
return Assert.insertApp(context, packageName, appName, values);
}

6
app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java
View File

@@ -37,7 +37,7 @@ public class PreferredSignatureTest extends FDroidProviderTest {
}
private App populateFDroidRepo(Repo repo) {
App app = TestUtils.insertApp(context, PACKAGE_NAME, "App", 3100, repo);
App app = TestUtils.insertApp(context, PACKAGE_NAME, "App", 3100, repo, TestUtils.UPSTREAM_SIG);
TestUtils.insertApk(context, app, 1100, TestUtils.FDROID_SIG); // 1.0
TestUtils.insertApk(context, app, 2100, TestUtils.FDROID_SIG); // 2.0
@@ -54,7 +54,7 @@ public class PreferredSignatureTest extends FDroidProviderTest {
}
private App populateDevRepo(Repo repo) {
App app = TestUtils.insertApp(context, PACKAGE_NAME, "App", 4100, repo);
App app = TestUtils.insertApp(context, PACKAGE_NAME, "App", 4100, repo, TestUtils.THIRD_PARTY_SIG);
TestUtils.insertApk(context, app, 1001, TestUtils.THIRD_PARTY_SIG); // 1.0-rc2
TestUtils.insertApk(context, app, 1100, TestUtils.THIRD_PARTY_SIG); // 1.0
@@ -78,7 +78,7 @@ public class PreferredSignatureTest extends FDroidProviderTest {
}
private App populateUpstreamRepo(Repo repo) {
App app = TestUtils.insertApp(context, PACKAGE_NAME, "App", 4100, repo);
App app = TestUtils.insertApp(context, PACKAGE_NAME, "App", 4100, repo, TestUtils.UPSTREAM_SIG);
TestUtils.insertApk(context, app, 2100, TestUtils.UPSTREAM_SIG);
TestUtils.insertApk(context, app, 3100, TestUtils.UPSTREAM_SIG);

1
app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
View File

@@ -263,6 +263,7 @@ public class IndexV1UpdaterTest extends FDroidProviderTest {
"installedSig",
"installedVersionCode",
"installedVersionName",
"preferredSigner",
"prefs",
"TAG",
};