diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9bd90dd..a0213dab 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,6 @@ +variables: + GIT_SUBMODULE_STRATEGY: recursive + buildAndDeployApkUnstable: stage: build script: diff --git a/app/src/main/java/com/futo/platformplayer/UpdateDownloadService.kt b/app/src/main/java/com/futo/platformplayer/UpdateDownloadService.kt index b0609604..7195580c 100644 --- a/app/src/main/java/com/futo/platformplayer/UpdateDownloadService.kt +++ b/app/src/main/java/com/futo/platformplayer/UpdateDownloadService.kt @@ -132,7 +132,7 @@ class UpdateDownloadService : Service() { } try { - performDownload(StateUpdate.APK_URL, partialFile, version, { + performDownload(StateUpdate.getApkUrl(version), partialFile, version, { try { if (announcement != null) announcement?.setProgress(it); diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/AutoUpdateDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/AutoUpdateDialog.kt index ccee6082..cb9d513d 100644 --- a/app/src/main/java/com/futo/platformplayer/dialogs/AutoUpdateDialog.kt +++ b/app/src/main/java/com/futo/platformplayer/dialogs/AutoUpdateDialog.kt @@ -134,7 +134,7 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) { var inputStream: InputStream? = null; try { val client = ManagedHttpClient(); - val response = client.get(StateUpdate.APK_URL); + val response = client.get(StateUpdate.getApkUrl(_maxVersion)); if (response.isOk && response.body != null) { inputStream = response.body.byteStream(); val dataLength = response.body.contentLength(); diff --git a/app/src/main/java/com/futo/platformplayer/states/StateUpdate.kt b/app/src/main/java/com/futo/platformplayer/states/StateUpdate.kt index 1a000045..61fb36d6 100644 --- a/app/src/main/java/com/futo/platformplayer/states/StateUpdate.kt +++ b/app/src/main/java/com/futo/platformplayer/states/StateUpdate.kt @@ -97,16 +97,16 @@ class StateUpdate { throw Exception("App is not compatible. Supported ABIS: ${Build.SUPPORTED_ABIS.joinToString()}}."); }; val VERSION_URL = if (BuildConfig.IS_UNSTABLE_BUILD) { - "https://releases.grayjay.app/version-unstable.txt" + "https://rel.grayjay.app/version-unstable.txt" } else { - "https://releases.grayjay.app/version.txt" + "https://rel.grayjay.app/version.txt" } - val APK_URL = if (BuildConfig.IS_UNSTABLE_BUILD) { - "https://releases.grayjay.app/app-$DESIRED_ABI-release-unstable.apk" + fun getApkUrl(version: Int): String = if (BuildConfig.IS_UNSTABLE_BUILD) { + "https://rel.grayjay.app/$version/app-$DESIRED_ABI-release-unstable.apk" } else { - "https://releases.grayjay.app/app-$DESIRED_ABI-release.apk" + "https://rel.grayjay.app/$version/app-$DESIRED_ABI-release.apk" } - val CHANGELOG_BASE_URL = "https://releases.grayjay.app/changelogs"; + val CHANGELOG_BASE_URL = "https://rel.grayjay.app/changelogs"; fun getApkFile(context: Context, version: Int): File { val dir = File(context.filesDir, "updates");