Add New Repositories (#525)

Droid-ify · Oct 19, 2023 · 933b6b9 · 933b6b9
1 parent 647b838
commit 933b6b9
Show file tree

Hide file tree

Showing 3 changed files with 141 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/looker/droidify/database/Database.kt b/app/src/main/kotlin/com/looker/droidify/database/Database.kt
@@ -17,7 +17,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
 
 object Database {
@@ -28,6 +27,9 @@ object Database {
 			for (repository in Repository.defaultRepositories) {
 				RepositoryAdapter.put(repository)
 			}
+		} else if (Repository.newlyAdded.isNotEmpty()) {
+			Repository.newlyAdded.forEach { RepositoryAdapter.put(it) }
+			Repository.newlyAdded.clear()
 		}
 		return helper.created || helper.updated
 	}

diff --git a/app/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt b/app/src/main/kotlin/com/looker/droidify/index/RepositoryUpdater.kt
@@ -6,6 +6,7 @@ import com.looker.core.common.SdkCheck
 import com.looker.core.common.cache.Cache
 import com.looker.core.common.extension.fingerprint
 import com.looker.core.common.extension.toFormattedString
+import com.looker.core.common.log
 import com.looker.core.common.result.Result
 import com.looker.core.model.Product
 import com.looker.core.model.Release
@@ -328,7 +329,7 @@ object RepositoryUpdater {
 					.fingerprint()
 					.uppercase()
 
-				val commitRepository = if (workRepository.fingerprint != fingerprint) {
+				val commitRepository = if (!workRepository.fingerprint.equals(fingerprint, ignoreCase = true)) {
 					if (workRepository.fingerprint.isNotEmpty()) throw UpdateException(
 						ErrorType.VALIDATION,
 						"Certificate fingerprints do not match"

diff --git a/core/model/src/main/java/com/looker/core/model/Repository.kt b/core/model/src/main/java/com/looker/core/model/Repository.kt
@@ -262,7 +262,142 @@ data class Repository(
 				name = "Session",
 				description = "The official repository for Session. Session is an open-source messanger focused on security and privacy.",
 				fingerprint = "DB0E5297EB65CC22D6BD93C869943BDCFCB6A07DC69A48A0DD8C7BA698EC04E6"
-			)
+			),
+			defaultRepository(
+				address = "https://www.cromite.org/fdroid/repo",
+				name = "Cromite",
+				description = "The official repository for Cromite. Cromite is a Chromium with ad blocking and enhanced privacy.",
+				fingerprint = "49F37E74DEE483DCA2B991334FB5A0200787430D0B5F9A783DD5F13695E9517B"
+			),
+			defaultRepository(
+				address = "https://fdroid.twinhelix.com/fdroid/repo",
+				name = "TwinHelix",
+				description = "TwinHelix F-Droid Repository, used for Signal-FOSS, an open-source fork of Signal Private Messenger.",
+				fingerprint = "7b03b0232209b21b10a30a63897d3c6bca4f58fe29bc3477e8e3d8cf8e304028"
+			),
+			defaultRepository(
+				address = "https://fdroid.typeblog.net",
+				name = "PeterCxy's F-Droid",
+				description = "You have landed on PeterCxy's F-Droid repo. To use this repository, please add the page's URL to your F-Droid client.",
+				fingerprint = "1a7e446c491c80bc2f83844a26387887990f97f2f379ae7b109679feae3dbc8c"
+			),
+			defaultRepository(
+				address = "https://s2.spiritcroc.de/fdroid/repo",
+				name = "SpiritCroc.de",
+				description = "While some of my apps are available from the official F-Droid repository, I also maintain my own repository for a small selection of apps. These might be forks of other apps with only minor changes, or apps that are not published on the Play Store for other reasons. In contrast to the official F-Droid repos, these might also include proprietary libraries, e.g. for push notifications.",
+				fingerprint = "6612ade7e93174a589cf5ba26ed3ab28231a789640546c8f30375ef045bc9242"
+			),
+			defaultRepository(
+				address = "https://s2.spiritcroc.de/testing/fdroid/repo",
+				name = "SpiritCroc.de Test Builds",
+				description = "SpiritCroc.de Test Builds",
+				fingerprint = "52d03f2fab785573bb295c7ab270695e3a1bdd2adc6a6de8713250b33f231225"
+			),
+			defaultRepository(
+				address = "https://static.cryptomator.org/android/fdroid/repo",
+				name = "Cryptomator",
+				description = "No Description",
+				fingerprint = "f7c3ec3b0d588d3cb52983e9eb1a7421c93d4339a286398e71d7b651e8d8ecdd"
+			),
+			defaultRepository(
+				address = "https://divestos.org/apks/unofficial/fdroid/repo",
+				name = "DivestOS Unofficial",
+				description = "This repository contains unofficial builds of open source apps that are not included in the other repos.",
+				fingerprint = "a18cdb92f40ebfbbf778a54fd12dbd74d90f1490cb9ef2cc6c7e682dd556855d"
+			),
+			defaultRepository(
+				address = "https://cdn.kde.org/android/stable-releases/fdroid/repo",
+				name = "KDE Stables",
+				description = "This repository contains unofficial builds of open source apps that are not included in the other repos.",
+				fingerprint = "13784ba6c80ff4e2181e55c56f961eed5844cea16870d3b38d58780b85e1158f"
+			),
+			defaultRepository(
+				address = "https://julianfairfax.gitlab.io/fdroid-repo/fdroid/repo",
+				name = "Julian's F-Droid Repo (Proton, GrapheneOS)",
+				description = "Repository for installing apps more easily.",
+				fingerprint = "561AD800D900CA8EBF3A531C6A860B5AB8569D0D376FD121CBCCFCA9434D7DF7"
+			),
+			defaultRepository(
+				address = "https://zimbelstern.eu/fdroid/repo",
+				name = "Zimbelstern's F-Droid repository",
+				description = "This is the official repository of apps from zimbelstern.eu, to be used with F-Droid.",
+				fingerprint = "285158DECEF37CB8DE7C5AF14818ACBF4A9B1FBE63116758EFC267F971CA23AA"
+			),
+			defaultRepository(
+				address = "https://app.simplex.chat/fdroid/repo",
+				name = "SimpleX Chat F-Droid",
+				description = "SimpleX Chat official F-Droid repository.",
+				fingerprint = "9F358FF284D1F71656A2BFAF0E005DEAE6AA14143720E089F11FF2DDCFEB01BA"
+			),
+		)
+
+		val newlyAdded = mutableListOf(
+			defaultRepository(
+				address = "https://www.cromite.org/fdroid/repo",
+				name = "Cromite",
+				description = "The official repository for Cromite. Cromite is a Chromium with ad blocking and enhanced privacy.",
+				fingerprint = "49F37E74DEE483DCA2B991334FB5A0200787430D0B5F9A783DD5F13695E9517B"
+			),
+			defaultRepository(
+				address = "https://fdroid.twinhelix.com/fdroid/repo",
+				name = "TwinHelix",
+				description = "TwinHelix F-Droid Repository, used for Signal-FOSS, an open-source fork of Signal Private Messenger.",
+				fingerprint = "7b03b0232209b21b10a30a63897d3c6bca4f58fe29bc3477e8e3d8cf8e304028"
+			),
+			defaultRepository(
+				address = "https://fdroid.typeblog.net",
+				name = "PeterCxy's F-Droid",
+				description = "You have landed on PeterCxy's F-Droid repo. To use this repository, please add the page's URL to your F-Droid client.",
+				fingerprint = "1a7e446c491c80bc2f83844a26387887990f97f2f379ae7b109679feae3dbc8c"
+			),
+			defaultRepository(
+				address = "https://s2.spiritcroc.de/fdroid/repo",
+				name = "SpiritCroc.de",
+				description = "While some of my apps are available from the official F-Droid repository, I also maintain my own repository for a small selection of apps. These might be forks of other apps with only minor changes, or apps that are not published on the Play Store for other reasons. In contrast to the official F-Droid repos, these might also include proprietary libraries, e.g. for push notifications.",
+				fingerprint = "6612ade7e93174a589cf5ba26ed3ab28231a789640546c8f30375ef045bc9242"
+			),
+			defaultRepository(
+				address = "https://s2.spiritcroc.de/testing/fdroid/repo",
+				name = "SpiritCroc.de Test Builds",
+				description = "SpiritCroc.de Test Builds",
+				fingerprint = "52d03f2fab785573bb295c7ab270695e3a1bdd2adc6a6de8713250b33f231225"
+			),
+			defaultRepository(
+				address = "https://static.cryptomator.org/android/fdroid/repo",
+				name = "Cryptomator",
+				description = "No Description",
+				fingerprint = "f7c3ec3b0d588d3cb52983e9eb1a7421c93d4339a286398e71d7b651e8d8ecdd"
+			),
+			defaultRepository(
+				address = "https://divestos.org/apks/unofficial/fdroid/repo",
+				name = "DivestOS Unofficial",
+				description = "This repository contains unofficial builds of open source apps that are not included in the other repos.",
+				fingerprint = "a18cdb92f40ebfbbf778a54fd12dbd74d90f1490cb9ef2cc6c7e682dd556855d"
+			),
+			defaultRepository(
+				address = "https://cdn.kde.org/android/stable-releases/fdroid/repo",
+				name = "KDE Stables",
+				description = "This repository contains unofficial builds of open source apps that are not included in the other repos.",
+				fingerprint = "13784ba6c80ff4e2181e55c56f961eed5844cea16870d3b38d58780b85e1158f"
+			),
+			defaultRepository(
+				address = "https://julianfairfax.gitlab.io/fdroid-repo/fdroid/repo",
+				name = "Julian's F-Droid Repo (Proton, GrapheneOS)",
+				description = "Repository for installing apps more easily.",
+				fingerprint = "561AD800D900CA8EBF3A531C6A860B5AB8569D0D376FD121CBCCFCA9434D7DF7"
+			),
+			defaultRepository(
+				address = "https://zimbelstern.eu/fdroid/repo",
+				name = "Zimbelstern's F-Droid repository",
+				description = "This is the official repository of apps from zimbelstern.eu, to be used with F-Droid.",
+				fingerprint = "285158DECEF37CB8DE7C5AF14818ACBF4A9B1FBE63116758EFC267F971CA23AA"
+			),
+			defaultRepository(
+				address = "https://app.simplex.chat/fdroid/repo",
+				name = "SimpleX Chat F-Droid",
+				description = "SimpleX Chat official F-Droid repository.",
+				fingerprint = "9F358FF284D1F71656A2BFAF0E005DEAE6AA14143720E089F11FF2DDCFEB01BA"
+			),
 		)
 	}
 }