Improve GitHub update experience for APK flavors

Author: wizdom13

.github/workflows/build-release-apk.yml

@@ -95,7 +95,7 @@ jobs:
             echo "Missing one or more NewPipe Material release signing secrets" >&2
             exit 1
           fi
-          ./gradlew clean assembleFullRelease assembleFdroidRelease --stacktrace
+          ./gradlew clean assembleFullRelease assembleFdroidRelease --stacktrace -DskipFormatKtlint
 
       - name: Verify release APK identities
         run: |
@@ -129,8 +129,8 @@ jobs:
             exit 1
           fi
 
-          FULL_APK_NAME="NewPipeMaterial_v${VERSION_NAME}_full.apk"
-          FDROID_APK_NAME="NewPipeMaterial_v${VERSION_NAME}_fdroid.apk"
+          FULL_APK_NAME="NewPipe_Material-${VERSION_NAME}-full.apk"
+          FDROID_APK_NAME="NewPipe_Material-${VERSION_NAME}-fdroid.apk"
           FULL_APK_PATH="app/build/outputs/apk/full/release/${FULL_APK_NAME}"
           FDROID_APK_PATH="app/build/outputs/apk/fdroid/release/${FDROID_APK_NAME}"
           CHANGELOG_PATH="fastlane/metadata/android/en-US/changelogs/${VERSION_CODE}.txt"
@@ -158,7 +158,7 @@ jobs:
         if: ${{ github.event_name == 'workflow_dispatch' && (inputs.release_target == 'artifacts' || inputs.release_target == 'all') }}
         uses: actions/upload-artifact@v7
         with:
-          name: newpipe-material-signed-release-apks
+          name: newpipe-material-signed-release-apks-${{ steps.release_info.outputs.version_name }}
           path: |
             ${{ steps.release_info.outputs.full_apk_path }}
             ${{ steps.release_info.outputs.fdroid_apk_path }}

app/build.gradle.kts

@@ -94,10 +94,14 @@ configure<ApplicationExtension> {
         create("full") {
             dimension = "distribution"
             buildConfigField("boolean", "CAST_ENABLED", "true")
+            buildConfigField("String", "DISTRIBUTION_FLAVOR", "\"full\"")
+            manifestPlaceholders["distributionFlavor"] = "full"
         }
         create("fdroid") {
             dimension = "distribution"
             buildConfigField("boolean", "CAST_ENABLED", "false")
+            buildConfigField("String", "DISTRIBUTION_FLAVOR", "\"fdroid\"")
+            manifestPlaceholders["distributionFlavor"] = "fdroid"
         }
     }
 

app/src/main/AndroidManifest.xml

@@ -11,7 +11,8 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <!-- We need to be able to open links in the browser on API 30+ -->
     <queries>
@@ -155,6 +156,10 @@
             android:exported="false"
             android:label="@string/recaptcha" />
 
+        <meta-data
+            android:name="org.schabi.newpipe.DISTRIBUTION_FLAVOR"
+            android:value="${distributionFlavor}" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

app/src/main/java/org/schabi/newpipe/NewVersionWorker.kt

@@ -34,7 +34,11 @@ class NewVersionWorker(
     )
 
     private fun handleUpdateCheckResult(result: UpdateCheckResult, isManual: Boolean) {
-        if (!isManual && result.comparison == VersionComparison.NEWER) {
+        if (
+            !isManual &&
+            result.comparison == VersionComparison.NEWER &&
+            result.release.compatibleAsset != null
+        ) {
             showUpdateNotification(result.release, result.installedVersion)
         }
     }
@@ -66,7 +70,8 @@ class NewVersionWorker(
                 applicationContext.getString(
                     R.string.app_update_available_notification_text_material,
                     release.version,
-                    installedVersion
+                    installedVersion,
+                    NewPipeMaterialUpdateRepository.installedDistributionFlavor()
                 )
             )
 
@@ -120,6 +125,10 @@ class NewVersionWorker(
                 applicationContext.getString(R.string.latest_available_changelog_key),
                 release.body
             )
+            putString(
+                applicationContext.getString(R.string.latest_available_asset_url_key),
+                release.compatibleAsset?.browserDownloadUrl.orEmpty()
+            )
         }
 
         return UpdateCheckResult(release, installedVersion, comparison).also {
@@ -153,7 +162,14 @@ class NewVersionWorker(
             OUTPUT_COMPARISON to comparison.name,
             OUTPUT_LATEST_VERSION to release.version,
             OUTPUT_INSTALLED_VERSION to installedVersion,
-            OUTPUT_RELEASE_URL to release.htmlUrl
+            OUTPUT_RELEASE_URL to release.htmlUrl,
+            OUTPUT_RELEASE_DATE to release.publishedAt,
+            OUTPUT_RELEASE_BODY to release.body,
+            OUTPUT_ASSET_NAME to release.compatibleAsset?.name.orEmpty(),
+            OUTPUT_ASSET_URL to release.compatibleAsset?.browserDownloadUrl.orEmpty(),
+            OUTPUT_ASSET_SIZE to (release.compatibleAsset?.size ?: -1L),
+            OUTPUT_ASSET_IS_ZIP to (release.compatibleAsset?.isZip ?: false),
+            OUTPUT_DISTRIBUTION_FLAVOR to NewPipeMaterialUpdateRepository.installedDistributionFlavor()
         )
     }
 
@@ -164,6 +180,13 @@ class NewVersionWorker(
         const val OUTPUT_LATEST_VERSION = "latestVersion"
         const val OUTPUT_INSTALLED_VERSION = "installedVersion"
         const val OUTPUT_RELEASE_URL = "releaseUrl"
+        const val OUTPUT_RELEASE_DATE = "releaseDate"
+        const val OUTPUT_RELEASE_BODY = "releaseBody"
+        const val OUTPUT_ASSET_NAME = "assetName"
+        const val OUTPUT_ASSET_URL = "assetUrl"
+        const val OUTPUT_ASSET_SIZE = "assetSize"
+        const val OUTPUT_ASSET_IS_ZIP = "assetIsZip"
+        const val OUTPUT_DISTRIBUTION_FLAVOR = "distributionFlavor"
 
         /**
          * Start a worker which checks GitHub Releases for NewPipe Material updates.