fix: Use Morphe patches API (#12)

Author: LisoUseInAIKyrios

api/build.gradle.kts

@@ -107,11 +107,10 @@ publishing {
                     developer {
                         id = "Morphe"
                         name = "Morphe"
-                        email = "contact@morphe.software"
+                        url = "https://morphe.software"
                     }
                 }
                 scm {
-                    // FIXME
                     val ghRepo = System.getenv("GITHUB_REPOSITORY") ?: "MorpheApp/morphe-manager"
                     connection = "scm:git:git://github.com/$ghRepo.git"
                     developerConnection = "scm:git:git@github.com:$ghRepo.git"

app/src/main/java/app/revanced/manager/ManagerApplication.kt

@@ -38,7 +38,7 @@ class ManagerApplication : Application() {
     private val patchBundleRepository: PatchBundleRepository by inject()
     private val downloaderPluginRepository: DownloaderPluginRepository by inject()
     private val fs: Filesystem by inject()
-    private val httpService: HttpService by inject()
+//    private val httpService: HttpService by inject()
 
     override fun onCreate() {
         super.onCreate()
@@ -94,6 +94,7 @@ class ManagerApplication : Application() {
         scope.launch(Dispatchers.Default) {
             downloaderPluginRepository.reload()
         }
+        // Morphe
 //        scope.launch(Dispatchers.Default) {
 //            PatchListCatalog.refreshIfNeeded(httpService)
 //        }

app/src/main/java/app/revanced/manager/data/room/bundles/PatchBundleEntity.kt

@@ -10,11 +10,11 @@ sealed class Source {
         override fun toString() = SENTINEL
     }
 
-//    object API : Source() {
-//        const val SENTINEL = "api"
-//
-//        override fun toString() = SENTINEL
-//    }
+    object API : Source() {
+        const val SENTINEL = "api"
+
+        override fun toString() = SENTINEL
+    }
 
     data class Remote(val url: Url) : Source() {
         override fun toString() = url.toString()
@@ -31,7 +31,7 @@ sealed class Source {
 
         fun from(value: String) = when (value) {
             Local.SENTINEL -> Local
-//            API.SENTINEL -> API
+            API.SENTINEL -> API
             else -> if (gitHubPullRequestPattern.matches(value)) {
                 GitHubPullRequest(Url(value))
             } else Remote(Url(value))

app/src/main/java/app/revanced/manager/domain/bundles/RemotePatchBundle.kt

@@ -165,41 +165,41 @@ class JsonPatchBundle(
     )
 }
 
-//class APIPatchBundle(
-//    name: String,
-//    uid: Int,
-//    displayName: String?,
-//    createdAt: Long?,
-//    updatedAt: Long?,
-//    installedVersionSignature: String?,
-//    error: Throwable?,
-//    directory: File,
-//    endpoint: String,
-//    autoUpdate: Boolean,
-//) : RemotePatchBundle(name, uid, displayName, createdAt, updatedAt, installedVersionSignature, error, directory, endpoint, autoUpdate) {
-//    private val api: ReVancedAPI by inject()
-//
-//    override suspend fun getLatestInfo() = api.getPatchesUpdate().getOrThrow()
-//    override fun copy(
-//        error: Throwable?,
-//        name: String,
-//        displayName: String?,
-//        createdAt: Long?,
-//        updatedAt: Long?,
-//        autoUpdate: Boolean
-//    ) = APIPatchBundle(
-//        name,
-//        uid,
-//        displayName,
-//        createdAt,
-//        updatedAt,
-//        installedVersionSignature,
-//        error,
-//        directory,
-//        endpoint,
-//        autoUpdate,
-//    )
-//}
+class APIPatchBundle(
+    name: String,
+    uid: Int,
+    displayName: String?,
+    createdAt: Long?,
+    updatedAt: Long?,
+    installedVersionSignature: String?,
+    error: Throwable?,
+    directory: File,
+    endpoint: String,
+    autoUpdate: Boolean,
+) : RemotePatchBundle(name, uid, displayName, createdAt, updatedAt, installedVersionSignature, error, directory, endpoint, autoUpdate) {
+    private val api: ReVancedAPI by inject()
+
+    override suspend fun getLatestInfo() = api.getPatchesUpdate().getOrThrow()
+    override fun copy(
+        error: Throwable?,
+        name: String,
+        displayName: String?,
+        createdAt: Long?,
+        updatedAt: Long?,
+        autoUpdate: Boolean
+    ) = APIPatchBundle(
+        name,
+        uid,
+        displayName,
+        createdAt,
+        updatedAt,
+        installedVersionSignature,
+        error,
+        directory,
+        endpoint,
+        autoUpdate,
+    )
+}
 
 class GitHubPullRequestBundle(
     name: String,

app/src/main/java/app/revanced/manager/domain/manager/PreferencesManager.kt

@@ -28,12 +28,7 @@ class PreferencesManager(
     val theme = enumPreference("theme", Theme.SYSTEM)
     val appLanguage = stringPreference("app_language", "en")
 
-    val patchesBundleJsonUrl = stringPreference(
-        "patches_bundle_json_url",
-        PatchBundleConstants.BUNDLE_URL_STABLE
-    )
-//    val api = stringPreference("api_url", "https://api.revanced.app")
-    // PR #35: https://github.com/Jman-Github/Universal-ReVanced-Manager/pull/35
+//    val api = stringPreference("api_url", "https://api.morphe.app")
     val gitHubPat = stringPreference("github_pat", "")
     val includeGitHubPatInExports = booleanPreference("include_github_pat_in_exports", false)
 
@@ -94,15 +89,7 @@ class PreferencesManager(
     }
 
     object PatchBundleConstants {
-        const val BUNDLE_URL_RELEASES = "https://github.com/HundEdFeteTree/HappyFunTest/releases/latest"
-        const val BUNDLE_URL_STABLE = "https://raw.githubusercontent.com/HundEdFeteTree/HappyFunTest/refs/heads/main/bundles/test-stable-patches-bundle.json"
-        const val BUNDLE_URL_LATEST = "https://raw.githubusercontent.com/HundEdFeteTree/HappyFunTest/refs/heads/main/bundles/test-latest-patches-bundle.json"
-
-        fun getBundleUrl(usePrerelease: Boolean): String {
-            // Latest will always be pre-release, or the latest stable
-            // which may contain additional changes not published in dev release
-            return if (usePrerelease) BUNDLE_URL_LATEST else BUNDLE_URL_STABLE
-        }
+        const val BUNDLE_URL_RELEASES = "https://github.com/MorpheApp/morphe-patches/releases/latest"
     }
 
     @Serializable
@@ -115,7 +102,6 @@ class PreferencesManager(
         val themePresetSelectionEnabled: Boolean? = null,
         val stripUnusedNativeLibs: Boolean? = null,
         val theme: Theme? = null,
-        val patchesBundleJsonUrl: String? = null,
         val appLanguage: String? = null,
 //        val api: String? = null,
         val gitHubPat: String? = null,
@@ -162,7 +148,6 @@ class PreferencesManager(
 //        api = api.get(),
         gitHubPat = gitHubPat.get().takeIf { includeGitHubPatInExports.get() },
         includeGitHubPatInExports = includeGitHubPatInExports.get(),
-        patchesBundleJsonUrl = patchesBundleJsonUrl.get(),
         useProcessRuntime = useProcessRuntime.get(),
         patcherProcessMemoryLimit = patcherProcessMemoryLimit.get(),
         autoCollapsePatcherSteps = autoCollapsePatcherSteps.get(),
@@ -205,7 +190,6 @@ class PreferencesManager(
 //        snapshot.api?.let { api.value = it }
         snapshot.gitHubPat?.let { gitHubPat.value = it }
         snapshot.includeGitHubPatInExports?.let { includeGitHubPatInExports.value = it }
-        snapshot.patchesBundleJsonUrl?.let { patchesBundleJsonUrl.value = it }
         snapshot.useProcessRuntime?.let { useProcessRuntime.value = it }
         snapshot.patcherProcessMemoryLimit?.let { patcherProcessMemoryLimit.value = it }
         snapshot.autoCollapsePatcherSteps?.let { autoCollapsePatcherSteps.value = it }