Addresses comments

Author: garanj

gradle/libs.versions.toml

@@ -2,6 +2,7 @@
 # build
 appVersionCode = "10"
 appVersionName = "1.3.0"
+appVersionWearOffset = "60000000"
 agp = "8.11.1"
 bcpkixJdk18on = "1.81"
 compileSdk = "36"

wear/build.gradle.kts

@@ -35,7 +35,7 @@ android {
         applicationId = "com.android.developers.androidify"
         targetSdk = 36
         // Ensure Wear OS app has its own version space
-        versionCode = 60_000_000 + libs.versions.appVersionCode.get().toInt()
+        versionCode = libs.versions.appVersionWearOffset.get().toInt() + libs.versions.appVersionCode.get().toInt()
         versionName = libs.versions.appVersionName.get()
     }
 

wear/src/main/java/com/android/developers/androidify/updater/UpdateReceiver.kt

@@ -29,11 +29,7 @@ import androidx.work.WorkManager
  * onReceive.
  */
 class UpdateReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context?, intent: Intent?) {
-        if (context == null || intent == null) {
-            return
-        }
-
+    override fun onReceive(context: Context, intent: Intent) {
         if (Intent.ACTION_MY_PACKAGE_REPLACED == intent.action) {
             val updateRequest = OneTimeWorkRequestBuilder<UpdateWorker>().build()
             val workManager = WorkManager.getInstance(context)

wear/src/main/java/com/android/developers/androidify/updater/UpdateWorker.kt

@@ -39,55 +39,55 @@ private const val TAG = "UpdateWorker"
  * and if so, updates the default watch face, taking also the new watch face validation token from
  * the manifest file.
  */
-class UpdateWorker(val appContext: Context, workerParams: WorkerParameters) :
+class UpdateWorker(appContext: Context, workerParams: WorkerParameters) :
     CoroutineWorker(appContext, workerParams) {
 
     override suspend fun doWork(): Result {
-        val watchFacePushManager = WatchFacePushManagerFactory.createWatchFacePushManager(appContext)
+        val watchFacePushManager = WatchFacePushManagerFactory.createWatchFacePushManager(applicationContext)
 
         val watchFaces = watchFacePushManager.listWatchFaces().installedWatchFaceDetails
             .associateBy { it.packageName }
 
-        val copiedFile = File.createTempFile("tmp", ".apk", appContext.cacheDir)
+        val copiedFile = File.createTempFile("tmp", ".apk", applicationContext.cacheDir)
         try {
-            copiedFile.deleteOnExit()
-            appContext.assets.open(defaultWatchFaceName).use { inputStream ->
+            applicationContext.assets.open(defaultWatchFaceName).use { inputStream ->
                 FileOutputStream(copiedFile).use { outputStream -> inputStream.copyTo(outputStream) }
             }
             val packageInfo =
-                appContext.packageManager.getPackageArchiveInfo(copiedFile.absolutePath, 0)
+                applicationContext.packageManager.getPackageArchiveInfo(copiedFile.absolutePath, 0)
 
             packageInfo?.let { newPkg ->
                 // Check if the default watch face is currently installed and should therefore be
                 // updated if the one in the assets folder has a higher version code.
                 watchFaces[newPkg.packageName]?.let { curPkg ->
                     if (newPkg.longVersionCode > curPkg.versionCode) {
-                        val pfd = ParcelFileDescriptor.open(
+                        ParcelFileDescriptor.open(
                             copiedFile,
                             ParcelFileDescriptor.MODE_READ_ONLY,
-                        )
-                        val token = getDefaultWatchFaceToken()
-                        if (token != null) {
-                            watchFacePushManager.updateWatchFace(curPkg.slotId, pfd, token)
-                            Log.d(TAG, "Watch face updated from ${curPkg.versionCode} to ${newPkg.longVersionCode}")
-                        } else {
-                            Log.w(TAG, "Watch face not updated, no token found")
+                        ).use { pfd ->
+                            val token = getDefaultWatchFaceToken()
+                            if (token != null) {
+                                watchFacePushManager.updateWatchFace(curPkg.slotId, pfd, token)
+                                Log.d(TAG, "Watch face updated from ${curPkg.versionCode} to ${newPkg.longVersionCode}")
+                            } else {
+                                Log.w(TAG, "Watch face not updated, no token found")
+                            }
                         }
-                        pfd.close()
                     }
                 }
             }
         } catch (e: IOException) {
             Log.w(TAG, "Watch face not updated", e)
+            return Result.failure()
         } finally {
             copiedFile.delete()
         }
         return Result.success()
     }
 
     private fun getDefaultWatchFaceToken(): String? {
-        val appInfo = appContext.packageManager.getApplicationInfo(
-            appContext.packageName,
+        val appInfo = applicationContext.packageManager.getApplicationInfo(
+            applicationContext.packageName,
             PackageManager.GET_META_DATA,
         )
         return appInfo.metaData?.getString(manifestTokenKey)

wear/watchface/build.gradle.kts

@@ -27,7 +27,7 @@ android {
         minSdk = 36
         targetSdk = 36
         // The default watch face version is kept in lock step with the Wear OS app.
-        versionCode = 60_000_000 + libs.versions.appVersionCode.get().toInt()
+        versionCode = libs.versions.appVersionWearOffset.get().toInt() + libs.versions.appVersionCode.get().toInt()
         versionName = libs.versions.appVersionName.get()
     }