add notification permission handling and update service foreground behavior

Author: softartdev

.github/dependabot.yml

@@ -8,28 +8,29 @@ on:
 jobs:
   build_test_publish_job:
     name: Build-Test-Publish job
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - name: Check out
+        uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '17'
-      - name: Cache gradle
-        uses: actions/cache@v1
+          distribution: 'oracle'
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          cache-read-only: false
+          cache-overwrite-existing: true
       - name: Decrypt large secret
         run: ./.github/scripts/decrypt_secret.sh
         env:
           LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
       - name: Build, Test & Upload to Google Play
         run: bundle exec fastlane build_bundle_publish
-      - name: Archive output artifacts
-        uses: actions/upload-artifact@v2
+      - name: Archive build artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
         with:
           name: output-artifacts
           path: |

.github/workflows/cd.yml

@@ -15,22 +15,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+        uses: actions/checkout@v4
+      - name: Gradle Wrapper Validation
+        uses: gradle/actions/wrapper-validation@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '17'
-      - name: Cache gradle
-        uses: actions/cache@v1
+          distribution: 'oracle'
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+          cache-read-only: false
+          cache-overwrite-existing: true
       - name: Build
         run: ./gradlew build
-      - name: Archive output artifacts
-        if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+      - name: Archive build-output artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
         with:
           name: output-artifacts
           path: |
@@ -39,33 +41,67 @@ jobs:
   android_ui_test_job:
     name: Android UI-tests on emulator
     needs: build_job
-    runs-on: macos-latest
+    runs-on: ubuntu-latest
     continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
-        api-level: [16, 17, 18, 19, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33]
+        api-level: [ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36 ]
+        target: [ default ]
     steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-java@v1
+      - name: Check out
+        uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'oracle'
+          java-version: 17
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          java-version: '17'
-      - name: Cache gradle
-        uses: actions/cache@v1
+          cache-read-only: false
+          cache-overwrite-existing: true
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+      - name: AVD cache
+        uses: actions/cache@v4
+        id: avd-cache
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Run debug UI-tests on emulator
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}-${{ matrix.target }}
+      - name: Create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
-          target: google_apis
-          script: ./gradlew :app:connectedCheck -PtestBuildType=debug
-      - name: Run release UI-tests on emulator
+          target: ${{ matrix.target }}
+          arch: x86_64
+          profile: Nexus 6
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
+      - name: Run UI-tests on emulator
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
-          target: google_apis
-          script: ./gradlew :app:connectedCheck -PtestBuildType=release
+          target: ${{ matrix.target }}
+          arch: x86_64
+          profile: Nexus 6
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: ./gradlew :app:connectedCheck
+      - name: Archive ui-tests-output artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: output-ui-tests-artifacts-${{ matrix.api-level }}-${{ matrix.target }}
+          path: |
+            app/build/outputs
+            app/build/reports

.github/workflows/ci.yml

@@ -6,5 +6,5 @@
 <p>
   <a href="https://play.google.com/store/apps/details?id=com.softartdev.conwaysgameoflife"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/apps/en-play-badge-border.png" height="75px"/></a>
 </p>
-<img src="https://raw.githubusercontent.com/softartdev/ConwaysGameOfLife/master/demo.gif" height="500" />
-<img src="https://raw.githubusercontent.com/softartdev/ConwaysGameOfLife/master/demo2rotated.gif" height="350" />
+<img src="https://raw.githubusercontent.com/softartdev/ConwaysGameOfLife/master/misc/demo.gif" height="500" />
+<img src="https://raw.githubusercontent.com/softartdev/ConwaysGameOfLife/master/misc/demo2rotated.gif" height="350" />

README.md

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
@@ -8,14 +10,14 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdk 33
+    compileSdkVersion 36
     defaultConfig {
         namespace 'com.softartdev.conwaysgameoflife'
         applicationId "com.softartdev.conwaysgameoflife"
-        minSdkVersion 16
-        targetSdk 33
-        versionCode 211
-        versionName '2.1.1'
+        minSdkVersion 23
+        targetSdkVersion 36
+        versionCode 212
+        versionName '2.1.2'
         resourceConfigurations += ['en']
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -50,29 +52,28 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
+    kotlin.compilerOptions.jvmTarget = JvmTarget.JVM_1_8
     testBuildType = project.hasProperty("testBuildType") ? project.property("testBuildType") : "debug"
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.10.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.17.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'com.google.android.material:material:1.13.0'
     implementation 'com.jakewharton.timber:timber:5.0.1'
-    implementation platform('com.google.firebase:firebase-bom:31.5.0')
+    implementation platform('com.google.firebase:firebase-bom:34.3.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-crashlytics'
-    def leak_canary_version = '2.10'
+    def leak_canary_version = '2.14'
     debugImplementation "com.squareup.leakcanary:leakcanary-android-process:$leak_canary_version"
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leak_canary_version"
     implementation "com.squareup.leakcanary:plumber-android:$leak_canary_version"
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:core:1.5.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test:rules:1.5.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test:core:1.7.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.7.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
     androidTestImplementation "com.squareup.leakcanary:leakcanary-android-instrumentation:$leak_canary_version"
 }

app/build.gradle

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <uses-sdk tools:overrideLibrary="com.google.firebase.firebase_analytics, com.google.firebase.measurement, com.google.android.gms.measurement.api, com.google.android.gms.measurement.sdk, com.google.firebase.measurement_impl, com.google.android.gms.measurement.sdk.api, com.google.android.gms.measurement_base" />
@@ -26,6 +27,7 @@
         </activity>
         <service
             android:name=".MainService"
+            android:foregroundServiceType="dataSync"
             android:exported="false" />
     </application>
 

app/src/main/AndroidManifest.xml

@@ -1,11 +1,24 @@
 package com.softartdev.conwaysgameoflife
 
-import android.app.*
+import android.Manifest
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.os.*
+import android.content.pm.PackageManager
+import android.content.pm.ServiceInfo
+import android.os.Binder
+import android.os.Build
+import android.os.Handler
+import android.os.IBinder
+import android.os.Looper
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.ServiceCompat
+import androidx.core.content.ContextCompat
 import com.softartdev.conwaysgameoflife.model.CellState
 import com.softartdev.conwaysgameoflife.model.ICellState
 import com.softartdev.conwaysgameoflife.ui.MainActivity
@@ -38,8 +51,7 @@ class MainService : Service() {
                 if (iCellState.isGoNextGeneration) {
                     val processed = iCellState.processNextGeneration()
                     if (serviceRunningInForeground) {
-                        val notification = createNotification(applicationContext, iCellState.countGeneration, notificationBuilder)
-                        notificationManager.notify(NOTIFICATION_ID, notification)
+                        updateNotificationSafely(applicationContext, iCellState, notificationBuilder, notificationManager)
                     } else {
                         uiHandler.post { uiRepaint?.invoke(processed) }
                     }
@@ -62,22 +74,27 @@ class MainService : Service() {
 
     override fun onBind(intent: Intent): IBinder {
         Timber.d("onBind")
-        stopForeground(true)
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         serviceRunningInForeground = false
         return mainBinder
     }
 
     override fun onRebind(intent: Intent?) {
         Timber.d("onRebind")
-        stopForeground(true)
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         serviceRunningInForeground = false
     }
 
     override fun onUnbind(intent: Intent?): Boolean {
         Timber.d("onUnbind")
         if (iCellState.isGoNextGeneration) {
             val notification = createNotification(applicationContext, iCellState.countGeneration, notificationBuilder)
-            startForeground(NOTIFICATION_ID, notification)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                val serviceType: Int = ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+                ServiceCompat.startForeground(this, NOTIFICATION_ID, notification, serviceType)
+            } else {
+                startForeground(NOTIFICATION_ID, notification)
+            }
         }
         serviceRunningInForeground = true
         return true
@@ -115,10 +132,7 @@ class MainService : Service() {
         ): NotificationCompat.Builder {
             val channelId = applicationContext.getString(R.string.notification_channel_id)
             val contentIntent = Intent(applicationContext, MainActivity::class.java)
-            var flags = PendingIntent.FLAG_UPDATE_CURRENT
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                flags = PendingIntent.FLAG_IMMUTABLE or flags
-            }
+            val flags: Int = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
             val contentPendingIntent = PendingIntent.getActivity(applicationContext, 0, contentIntent, flags)
             val cancelIntent = Intent(applicationContext, MainService::class.java)
                 .putExtra(EXTRA_CANCEL_FROM_NOTIFICATION, true)
@@ -138,11 +152,25 @@ class MainService : Service() {
             applicationContext: Context,
             stepCount: Int,
             notificationBuilder: NotificationCompat.Builder
-        ): Notification {
-            val contentText = applicationContext.getString(R.string.steps, stepCount)
-            return notificationBuilder
-                .setContentText(contentText)
-                .build()
+        ): Notification = notificationBuilder
+            .setContentText(applicationContext.getString(R.string.steps, stepCount))
+            .build()
+
+        private fun updateNotificationSafely(
+            applicationContext: Context,
+            iCellState: ICellState,
+            notificationBuilder: NotificationCompat.Builder,
+            notificationManager: NotificationManagerCompat,
+        ) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+                && ContextCompat.checkSelfPermission(applicationContext, Manifest.permission.POST_NOTIFICATIONS)
+                != PackageManager.PERMISSION_GRANTED
+            ) {
+                Timber.w("No notification permission, cannot update notification")
+                return
+            }
+            val notification = createNotification(applicationContext, iCellState.countGeneration, notificationBuilder)
+            notificationManager.notify(NOTIFICATION_ID, notification)
         }
     }
 }