Enable Play store uploads for internal Android releases

.github/workflows/release.yml

@@ -400,7 +400,7 @@ jobs:
     needs: [set-metadata, build-android]
     if: |
       (needs.set-metadata.outputs.platform == 'all' || contains(needs.set-metadata.outputs.platform, 'android')) &&
-      (needs.set-metadata.outputs.build_type == 'beta' || needs.set-metadata.outputs.build_type == 'production')
+      (needs.set-metadata.outputs.build_type == 'internal' || needs.set-metadata.outputs.build_type == 'beta' || needs.set-metadata.outputs.build_type == 'production')
     runs-on: ubuntu-latest
     steps:
       - name: Download AAB artifact
@@ -424,14 +424,17 @@ jobs:
       - name: Pick Play track
         id: track
         run: |
-          if [ "${{ needs.set-metadata.outputs.build_type }}" = "beta" ]; then
+          bt="${{ needs.set-metadata.outputs.build_type }}"
+          if [ "$bt" = "internal" ]; then
+            echo "track=internal" >> "$GITHUB_OUTPUT"
+          elif [ "$bt" = "beta" ]; then
             echo "track=beta" >> "$GITHUB_OUTPUT"
           else
             echo "track=production" >> "$GITHUB_OUTPUT"
           fi
 
       - name: Upload to Google Play
-        uses: r0adkll/upload-google-play@v1
+        uses: r0adkll/upload-google-play@v1.1.3
         with:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: org.getlantern.lantern

android/app/build.gradle

@@ -12,6 +12,10 @@ def hasReleaseKeystore =
         hasRelProp('KEY_ALIAS') &&
         hasRelProp('KEY_PWD')
 
+def start = new Date(2015, 1, 1).getTime()
+def now = System.currentTimeMillis()
+def code = (int)((now - start) / 1000)
+
 android {
     namespace = "org.getlantern.lantern"
     compileSdk = 36
@@ -52,7 +56,7 @@ android {
         applicationId = "org.getlantern.lantern"
         minSdkVersion = 24
         targetSdk = 36
-        versionCode = flutter.versionCode
+        versionCode = code
         versionName = flutter.versionName
 
         ndk {

android/app/src/main/AndroidManifest.xml

@@ -5,15 +5,16 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <!-- Switch to systemExempted (remove SPECIAL_USE) -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
+    <!-- <uses-permission android:name="android.permission.USE_EXACT_ALARM" /> -->
 
     <application
         android:name=".LanternApp"
@@ -80,14 +81,11 @@
         <service
             android:name=".service.LanternVpnService"
             android:exported="false"
-            android:foregroundServiceType="specialUse"
+            android:foregroundServiceType="systemExempted"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
-            <property
-                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                android:value="vpn" />
         </service>
 
         <service