diff --git a/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java b/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java
index 27f8b0329..93e721e2d 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/RepoProvider.java
@@ -313,7 +313,7 @@ public class RepoProvider extends FDroidProvider {
values.put(Cols.VERSION, 0);
}
- if (!values.containsKey(Cols.NAME)) {
+ if (!values.containsKey(Cols.NAME) || values.get(Cols.NAME) == null) {
final String address = values.getAsString(Cols.ADDRESS);
values.put(Cols.NAME, Repo.addressToName(address));
}
diff --git a/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
new file mode 100644
index 000000000..114cffca0
--- /dev/null
+++ b/app/src/test/java/org/fdroid/fdroid/data/RepoProviderTest.java
@@ -0,0 +1,155 @@
+package org.fdroid.fdroid.data;
+
+import android.app.Application;
+import android.content.ContentValues;
+import android.support.annotation.Nullable;
+
+import org.fdroid.fdroid.BuildConfig;
+import org.fdroid.fdroid.R;
+import org.fdroid.fdroid.Utils;
+import org.fdroid.fdroid.data.Schema.RepoTable;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+@Config(constants = BuildConfig.class, application = Application.class)
+@RunWith(RobolectricGradleTestRunner.class)
+public class RepoProviderTest extends FDroidProviderTest {
+
+ /**
+ * The {@link DBHelper} class populates four default repos when it first creates a database:
+ * * F-Droid
+ * * F-Droid (Archive)
+ * * Guardian Project
+ * * Guardian Project (Archive)
+ * The names/URLs/signing certificates for these repos are all hard coded in the source/res.
+ */
+ @Test
+ public void defaultRepos() {
+ List<Repo> defaultRepos = RepoProvider.Helper.all(context);
+ assertEquals(defaultRepos.size(), 4);
+ assertRepo(
+ defaultRepos.get(0),
+ context.getString(R.string.fdroid_repo_address),
+ context.getString(R.string.fdroid_repo_description),
+ Utils.calcFingerprint(context.getString(R.string.fdroid_repo_pubkey)),
+ context.getString(R.string.fdroid_repo_name)
+ );
+
+ assertRepo(
+ defaultRepos.get(1),
+ context.getString(R.string.fdroid_archive_address),
+ context.getString(R.string.fdroid_archive_description),
+ Utils.calcFingerprint(context.getString(R.string.fdroid_archive_pubkey)),
+ context.getString(R.string.fdroid_archive_name)
+ );
+
+ assertRepo(
+ defaultRepos.get(2),
+ context.getString(R.string.guardianproject_repo_address),
+ context.getString(R.string.guardianproject_repo_description),
+ Utils.calcFingerprint(context.getString(R.string.guardianproject_repo_pubkey)),
+ context.getString(R.string.guardianproject_repo_name)
+ );
+
+ assertRepo(
+ defaultRepos.get(3),
+ context.getString(R.string.guardianproject_archive_address),
+ context.getString(R.string.guardianproject_archive_description),
+ Utils.calcFingerprint(context.getString(R.string.guardianproject_archive_pubkey)),
+ context.getString(R.string.guardianproject_archive_name)
+ );
+ }
+
+ @Test
+ public void canAddRepo() {
+
+ assertEquals(4, RepoProvider.Helper.all(context).size());
+
+ Repo mock1 = insertRepo(
+ "https://mock-repo-1.example.com/fdroid/repo",
+ "Just a made up repo",
+ "ABCDEF1234567890",
+ "Mock Repo 1"
+ );
+
+ Repo mock2 = insertRepo(
+ "http://mock-repo-2.example.com/fdroid/repo",
+ "Mock repo without a name",
+ "0123456789ABCDEF"
+ );
+
+ assertEquals(6, RepoProvider.Helper.all(context).size());
+
+ assertRepo(
+ mock1,
+ "https://mock-repo-1.example.com/fdroid/repo",
+ "Just a made up repo",
+ "ABCDEF1234567890",
+ "Mock Repo 1"
+ );
+
+ assertRepo(
+ mock2,
+ "http://mock-repo-2.example.com/fdroid/repo",
+ "Mock repo without a name",
+ "0123456789ABCDEF",
+ "mock-repo-2.example.com/fdroid/repo"
+ );
+ }
+
+ private static void assertRepo(Repo actualRepo, String expectedAddress, String expectedDescription,
+ String expectedFingerprint, String expectedName) {
+ assertEquals(expectedAddress, actualRepo.address);
+ assertEquals(expectedDescription, actualRepo.description);
+ assertEquals(expectedFingerprint, actualRepo.fingerprint);
+ assertEquals(expectedName, actualRepo.name);
+ }
+
+ @Test
+ public void canDeleteRepo() {
+ Repo mock1 = insertRepo(
+ "https://mock-repo-1.example.com/fdroid/repo",
+ "Just a made up repo",
+ "ABCDEF1234567890",
+ "Mock Repo 1"
+ );
+
+ Repo mock2 = insertRepo(
+ "http://mock-repo-2.example.com/fdroid/repo",
+ "Mock repo without a name",
+ "0123456789ABCDEF"
+ );
+
+ List<Repo> beforeDelete = RepoProvider.Helper.all(context);
+ assertEquals(6, beforeDelete.size()); // Expect six repos, because of the four default ones.
+ assertEquals(mock1.id, beforeDelete.get(4).id);
+ assertEquals(mock2.id, beforeDelete.get(5).id);
+
+ RepoProvider.Helper.remove(context, mock1.getId());
+
+ List<Repo> afterDelete = RepoProvider.Helper.all(context);
+ assertEquals(5, afterDelete.size());
+ assertEquals(mock2.id, afterDelete.get(4).id);
+ }
+
+ protected Repo insertRepo(String address, String description, String fingerprint) {
+ return insertRepo(address, description, fingerprint, null);
+ }
+
+ protected Repo insertRepo(String address, String description, String fingerprint, @Nullable String name) {
+ ContentValues values = new ContentValues();
+ values.put(RepoTable.Cols.ADDRESS, address);
+ values.put(RepoTable.Cols.DESCRIPTION, description);
+ values.put(RepoTable.Cols.FINGERPRINT, fingerprint);
+ values.put(RepoTable.Cols.NAME, name);
+
+ RepoProvider.Helper.insert(context, values);
+ return RepoProvider.Helper.findByAddress(context, address);
+ }
+}