From cd10c54f3976bd4835b20649cd55e0881e1ced9c Mon Sep 17 00:00:00 2001
From: iSmartCoding <ismartcoding@gmail.com>
Date: Tue, 5 Dec 2023 22:33:26 +0800
Subject: [PATCH] Add build apk workflow

---
 .github/workflows/generate-apk-release.yml    |  36 ++++++++++++++++++
 .gitignore                                    |   4 +-
 app/build.gradle.kts                          |   2 +-
 app/free/release/output-metadata.json         |  20 ----------
 app/release.jks                               | Bin 0 -> 2727 bytes
 .../services/NotificationListenerService.kt   |   5 ++-
 build-apk.sh                                  |  33 ++++++++++++++++
 7 files changed, 76 insertions(+), 24 deletions(-)
 create mode 100644 .github/workflows/generate-apk-release.yml
 delete mode 100644 app/free/release/output-metadata.json
 create mode 100644 app/release.jks
 create mode 100644 build-apk.sh

diff --git a/.github/workflows/generate-apk-release.yml b/.github/workflows/generate-apk-release.yml
new file mode 100644
index 00000000..d57003b9
--- /dev/null
+++ b/.github/workflows/generate-apk-release.yml
@@ -0,0 +1,36 @@
+name: Generated APK
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set Up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+
+      # Create APK Release
+      - name: Build apk
+        run: |
+          ANDROID_STORE_PASSWORD=${{ secrets.ANDROID_STORE_PASSWORD }}
+          ANDROID_KEY_PASSWORD=${{ secrets.ANDROID_KEY_PASSWORD }}
+          bash build-apk.sh
+
+      # Upload Artifact Build
+      - name: Upload APK
+        uses: actions/upload-artifact@v3
+        with:
+          name: plain-app
+          path: /app/build/outputs/apk/free/release/app/
diff --git a/.gitignore b/.gitignore
index 710e7d09..bbe97b1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ build/
 # Local configuration file (sdk path, etc)
 local.properties
 keystore.properties
-release.jks
+# release.jks
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -80,4 +80,4 @@ lint/tmp/
 *.hprof
 
 .DS_Store
-/app/release/output-metadata.json
+output-metadata.json
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3e83e817..6191c482 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -78,7 +78,7 @@ android {
                 debugSymbolLevel = "SYMBOL_TABLE"
             }
             configure<CrashlyticsExtension> {
-                mappingFileUploadEnabled = true
+                mappingFileUploadEnabled = false
             }
 //            setProguardFiles(listOf(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"))
         }
diff --git a/app/free/release/output-metadata.json b/app/free/release/output-metadata.json
deleted file mode 100644
index 196b5ea9..00000000
--- a/app/free/release/output-metadata.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.ismartcoding.plain",
-  "variantName": "freeRelease",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "versionCode": 175,
-      "versionName": "1.2.14",
-      "outputFile": "app-free-release.apk"
-    }
-  ],
-  "elementType": "File"
-}
\ No newline at end of file
diff --git a/app/release.jks b/app/release.jks
new file mode 100644
index 0000000000000000000000000000000000000000..6d0a2178002695ef4d43b4f3833f4c720fda11c6
GIT binary patch
literal 2727
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
OI7wB8kwIV}o%t_o+T@J@

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/ismartcoding/plain/services/NotificationListenerService.kt b/app/src/main/java/com/ismartcoding/plain/services/NotificationListenerService.kt
index 35271ec1..66a77146 100644
--- a/app/src/main/java/com/ismartcoding/plain/services/NotificationListenerService.kt
+++ b/app/src/main/java/com/ismartcoding/plain/services/NotificationListenerService.kt
@@ -28,7 +28,10 @@ class NotificationListenerService : NotificationListenerService() {
 
     private fun isValidNotification(statusBarNotification: StatusBarNotification): Boolean {
         val notification = statusBarNotification.notification
-        if (notification.flags and Notification.FLAG_FOREGROUND_SERVICE != 0 || notification.flags and Notification.FLAG_ONGOING_EVENT != 0 || notification.flags and Notification.FLAG_LOCAL_ONLY != 0 || notification.flags and NotificationCompat.FLAG_GROUP_SUMMARY != 0 //The notification that groups other notifications
+        if (notification.flags and Notification.FLAG_FOREGROUND_SERVICE != 0
+            || notification.flags and Notification.FLAG_ONGOING_EVENT != 0
+            || notification.flags and Notification.FLAG_LOCAL_ONLY != 0
+            || notification.flags and NotificationCompat.FLAG_GROUP_SUMMARY != 0 //The notification that groups other notifications
         ) {
             //This is not a notification we want!
             return false
diff --git a/build-apk.sh b/build-apk.sh
new file mode 100644
index 00000000..4ab0a9a2
--- /dev/null
+++ b/build-apk.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+function err_and_exit()
+{
+  echo "$1" >&2
+  exit 1
+}
+
+function getVersionName() 
+{
+  echo $(grep versionName ./app/build.gradle.kts | awk -F '"' '{print $2}')
+}
+
+cat > ./keystore.properties <<EOF
+storePassword=$ANDROID_STORE_PASSWORD
+keyPassword=$ANDROID_KEY_PASSWORD
+keyAlias=plain
+storeFile=release.jks
+EOF
+
+cat > ./local.properties <<EOF
+sdk.dir=/Users/$USER/Library/Android/sdk
+EOF
+
+echo "Build PlainApp-$(getVersionName).apk..."
+
+./gradlew assembleFreeRelease || err_and_exit "build failed"
+
+echo "Copying apk file..."
+
+BUILD_FILE="PlainApp-$(getVersionName).apk"
+
+mv ./app/build/outputs/apk/free/release/app-free-release.apk ./app/build/outputs/apk/free/release/$BUILD_FILE
\ No newline at end of file