Merge pull request #71 from tetherto/staging

Author: torkinos

.github/workflows/build-and-publish.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - dev
+      - staging
 
 
 jobs:
@@ -37,10 +38,10 @@ jobs:
           docker builder prune -af || true
           df -h
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: true
-          token: ${{ secrets.PAT_TOKEN }}
+          token: ${{ secrets.PAT_TOKEN }}          
 
       - uses: actions/setup-node@v4
         with:
@@ -62,8 +63,8 @@ jobs:
 
       - name: Install worker dependencies
         run: |
-          git config --global url."https://github.com/".insteadOf git@github.com:
-          git config --global url."https://".insteadOf ssh://
+          git config --global url."https://${{ secrets.PAT_TOKEN }}:x-oauth-basic@github.com/".insteadOf "ssh://git@github.com/"
+          git config --global url."https://${{ secrets.PAT_TOKEN }}:x-oauth-basic@github.com/".insteadOf "git@github.com:"
           git config --global url."https://${{ secrets.PAT_TOKEN }}:x-oauth-basic@github.com/".insteadOf "https://github.com/"
           npm install --install-links --legacy-peer-deps
         env:
@@ -145,45 +146,71 @@ jobs:
           # CHANGED: add branch-aware profile
           eas build --platform android --profile ${{ steps.branch_profile.outputs.PROFILE }} --local --non-interactive
 
-      - name: Build APK for GitHub release (only when production profile)
-        if: steps.branch_profile.outputs.PROFILE == 'production'
+      - name: Resolve APK profile by branch
+        id: apk_profile
+        run: |
+          if [ "${GITHUB_REF##*/}" = "main" ]; then
+            APK_PROFILE=production-apk
+          else
+            APK_PROFILE=preview-apk
+          fi
+          echo "APK_PROFILE=$APK_PROFILE" >> "$GITHUB_OUTPUT" 
+
+      - name: Build APK for GitHub release
         env:
           EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
         run: |
-          eas build --platform android --profile preview --local --non-interactive
+          eas build --platform android --profile ${{ steps.apk_profile.outputs.APK_PROFILE }} --local --non-interactive
 
-      - name: Find and rename Android artifact
+      - name: Find and rename Android artifacts
         id: find_android
         run: |
           set -euo pipefail
+          VERSION="${{ steps.meta.outputs.VERSION }}"
+
           AAB_PATH=$(find "$GITHUB_WORKSPACE" -name "*.aab" -type f | head -n 1 || true)
           echo "Original AAB: $AAB_PATH"
-
           if [ -n "$AAB_PATH" ]; then
-            VERSION="${{ steps.meta.outputs.VERSION }}"
-            NEW_NAME="PearPass-Mobile-Android-v${VERSION}.aab"
-            NEW_PATH="$GITHUB_WORKSPACE/$NEW_NAME"
-
-            mv "$AAB_PATH" "$NEW_PATH"
-            echo "Renamed AAB to: $NEW_PATH"
-
-            echo "AAB_PATH=$NEW_PATH" >> "$GITHUB_OUTPUT"
+            NEW_AAB="PearPass-Mobile-Android-v${VERSION}.aab"
+            NEW_AAB_PATH="$GITHUB_WORKSPACE/$NEW_AAB"
+            mv "$AAB_PATH" "$NEW_AAB_PATH"
+            echo "AAB_PATH=$NEW_AAB_PATH" >> "$GITHUB_OUTPUT"
           else
             echo "No .aab file found."
             echo "AAB_PATH=" >> "$GITHUB_OUTPUT"
           fi
 
+          APK_PATH=$(find "$GITHUB_WORKSPACE" -name "*.apk" -type f | head -n 1 || true)
+          echo "Original APK: $APK_PATH"
+          if [ -n "$APK_PATH" ]; then
+            NEW_APK="PearPass-Mobile-Android-v${VERSION}.apk"
+            NEW_APK_PATH="$GITHUB_WORKSPACE/$NEW_APK"
+            mv "$APK_PATH" "$NEW_APK_PATH"
+            echo "APK_PATH=$NEW_APK_PATH" >> "$GITHUB_OUTPUT"
+          else
+            echo "No .apk file found."
+            echo "APK_PATH=" >> "$GITHUB_OUTPUT"
+          fi
+
           VERSION_CODE=$(jq -r '.expo.android.versionCode' app.json)
           TIMESTAMP=$(date +%Y%m%d-%H%M%S)
           echo "VERSION_CODE=$VERSION_CODE" >> "$GITHUB_OUTPUT"
           echo "TIMESTAMP=$TIMESTAMP" >> "$GITHUB_OUTPUT"
 
-      - name: Upload Android artifacts
+      - name: Upload Android AAB artifact
         uses: actions/upload-artifact@v4
         with:
           name: PearPass-Mobile-Android-v${{ steps.meta.outputs.VERSION }}.aab
           path: ${{ steps.find_android.outputs.AAB_PATH }}
           if-no-files-found: ignore
+      
+      - name: Upload Android APK artifact
+        if: steps.find_android.outputs.APK_PATH != ''
+        uses: actions/upload-artifact@v4
+        with:
+          name: PearPass-Mobile-Android-v${{ steps.meta.outputs.VERSION }}.apk
+          path: ${{ steps.find_android.outputs.APK_PATH }}
+          if-no-files-found: error
 
       - name: Submit to Google play via EAS
         env:
@@ -220,7 +247,7 @@ jobs:
   ios:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: true
           token: ${{ secrets.PAT_TOKEN }}
@@ -238,8 +265,8 @@ jobs:
 
       - name: Install worker dependencies
         run: |
-          git config --global url."https://github.com/".insteadOf git@github.com:
-          git config --global url."https://".insteadOf ssh://
+          git config --global url."https://${{ secrets.PAT_TOKEN }}:x-oauth-basic@github.com/".insteadOf "ssh://git@github.com/"
+          git config --global url."https://${{ secrets.PAT_TOKEN }}:x-oauth-basic@github.com/".insteadOf "git@github.com:"
           git config --global url."https://${{ secrets.PAT_TOKEN }}:x-oauth-basic@github.com/".insteadOf "https://github.com/"
           npm install --install-links --legacy-peer-deps
         env:
@@ -386,13 +413,20 @@ jobs:
     needs: [android, ios]
     if: github.ref == 'refs/heads/main'
     steps:
-      - name: Download Android artifacts
+      - name: Download Android AAB artifact
         uses: actions/download-artifact@v4
         with:
           name: PearPass-Mobile-Android-v${{ needs.android.outputs.version }}.aab
           path: ./dist
         continue-on-error: false
 
+      - name: Download Android APK artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: PearPass-Mobile-Android-v${{ needs.android.outputs.version }}.apk
+          path: ./dist
+        continue-on-error: false
+
       - name: Download iOS artifacts
         uses: actions/download-artifact@v4
         with:
@@ -415,6 +449,7 @@ jobs:
           files: |
             dist/**/*.ipa
             dist/**/*.aab
+            dist/**/*.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/lint.yml

@@ -0,0 +1,32 @@
+name: Lint check
+
+on:
+  push:
+    branches: [ main, dev ]
+  pull_request:
+    branches: [ main, dev ]
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run ESLint
+        run: npm run lint

.github/workflows/test.yml

@@ -0,0 +1,35 @@
+name: Test check
+
+on:
+  push:
+    branches: [ main, dev ]
+  pull_request:
+    branches: [ main, dev ]
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Compile locale files
+        run: npm run lingui:compile
+
+      - name: Run tests
+        run: npm test

.npmrc

@@ -1,3 +1 @@
 legacy-peer-deps=true
-install-links=true
-

android/app/build.gradle

@@ -93,7 +93,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.1.1"
+        versionName "1.2.1"
     }
     signingConfigs {
         debug {
@@ -188,12 +188,15 @@ dependencies {
     // RecyclerView dependency for autofill extension
     implementation("androidx.recyclerview:recyclerview:1.3.2")
 
-    // AndroidX Autofill for Samsung keyboard compatibility (same as Bitwarden uses)
+    // AndroidX Autofill for Samsung keyboard compatibility
     implementation("androidx.autofill:autofill:1.3.0")
 
     // AndroidX Biometric for fingerprint/face authentication
     implementation("androidx.biometric:biometric:1.1.0")
 
+    // WorkManager for reliable background task scheduling (clipboard clearing)
+    implementation("androidx.work:work-runtime-ktx:2.9.0")
+
     def isGifEnabled = (findProperty('expo.gif.enabled') ?: "") == "true";
     def isWebpEnabled = (findProperty('expo.webp.enabled') ?: "") == "true";
     def isWebpAnimatedEnabled = (findProperty('expo.webp.animated') ?: "") == "true";

android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,6 @@
   <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-  <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
   <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
@@ -51,13 +50,5 @@
         android:windowSoftInputMode="adjustResize"
         android:launchMode="singleTop" />
 
-    <!-- Clipboard Clear Receiver -->
-    <receiver
-        android:name=".ClipboardClearReceiver"
-        android:exported="false">
-      <intent-filter>
-        <action android:name="com.pears.pass.CLEAR_CLIPBOARD" />
-      </intent-filter>
-    </receiver>
   </application>
 </manifest>

android/app/src/main/java/com/noxtton/pearpass/ClearClipboardWorker.kt

@@ -0,0 +1,44 @@
+package com.pears.pass
+
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Build
+import android.content.ClipData
+import android.util.Log
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+
+/**
+ * A WorkManager worker to clear the clipboard after a delay.
+ * Uses WorkManager instead of AlarmManager+BroadcastReceiver because
+ * WorkManager provides proper execution context that can access the clipboard
+ * even on Android 10+ where background clipboard access is restricted.
+ */
+class ClearClipboardWorker(
+    appContext: Context,
+    workerParams: WorkerParameters,
+) : Worker(appContext, workerParams) {
+
+    companion object {
+        const val TAG = "ClearClipboardWorker"
+    }
+
+    private val clipboardManager =
+        appContext.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+
+    override fun doWork(): Result {
+        return try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                clipboardManager.clearPrimaryClip()
+            } else {
+                val clip = ClipData.newPlainText("", "")
+                clipboardManager.setPrimaryClip(clip)
+            }
+            Log.d(TAG, "Clipboard cleared successfully")
+            Result.success()
+        } catch (e: Exception) {
+            Log.e(TAG, "Failed to clear clipboard", e)
+            Result.failure()
+        }
+    }
+}