[pull] master from apps4av:master

.github/workflows/android.yml

@@ -0,0 +1,71 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set app version
+      run: |
+        echo "APP_VERSION=$(sed -n 's/.*android:versionName="\([^"]*\)".*/\1/p' app/src/main/AndroidManifest.xml)" >> "$GITHUB_ENV"
+    - name: set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: gradle
+
+    - name: Find and Replace RC Key
+      uses: richardrigutins/replace-in-files@v2
+      with:
+        files: '**/*.java'
+        search-text: '@@___revenuecat_android_api_key__@@'
+        replacement-text: ${{ secrets.ANDROID_REVENUECAT_API_KEY }}
+        encoding: 'utf8'
+        max-parallelism: 10
+
+    - name: Create Google Services JSON File
+      env:
+        GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
+      run: rm -f app/google-services.json && (echo $GOOGLE_SERVICES_JSON | base64 -di > app/google-services.json)
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build
+
+    - name: Sign APK with keystore
+      uses: r0adkll/sign-android-release@v1
+      id: sign_app
+      with:
+        releaseDirectory: app/build/outputs/apk/release
+        signingKeyBase64: ${{ secrets.KEY_STORE }}
+        alias: ${{ secrets.KEY_STORE_ALIAS }}
+        keyStorePassword: ${{ secrets.KEY_STORE_PASS }}
+        keyPassword: ${{ secrets.KEY_STORE_PASS }}
+      env:
+        BUILD_TOOLS_VERSION: "34.0.0"
+
+    - name: Prepare upload artifact
+      run: |
+        mkdir -p build/artifacts
+        cp "${{ steps.sign_app.outputs.signedReleaseFile }}" "build/artifacts/avare_${APP_VERSION}.apk"
+
+    - name: Upload release APK
+      uses: appleboy/scp-action@v0.1.7
+      with:
+        host: apps4av.org
+        username: apps4av
+        password: ${{ secrets.MAMBA_PASSWORD }}
+        port: 22
+        strip_components: 2
+        source: build/artifacts/*
+        target: /home/apps4av/builds

.github/workflows/weather.yml

@@ -0,0 +1,38 @@
+name: Weather CI
+
+
+on:
+  schedule:
+    - cron: '*/10 * * * *'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-24.04
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.12"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          sudo apt-get update
+          sudo apt-get install --fix-missing gdal-bin python3-gdal imagemagick python3-bs4 libwww-perl libxml-parser-perl
+          pip install regex urllib3
+      - name: Build weather
+        run: |
+          cd extra/mamba && ./put_tenmin.sh
+
+      - name: SSH to mamba
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: apps4av.org
+          username: apps4av
+          password: ${{ secrets.MAMBA_PASSWORD }}
+          port: 22
+          strip_components: 2
+          source: "extra/mamba/TFRs.zip,extra/mamba/weather.zip,extra/mamba/conus.zip"
+          target: /home/apps4av/mamba.dreamhosters.com/new

README.md

@@ -1,6 +1,12 @@
+** This project is deprecated/discontinued. See the new project under https://github.com/apps4av/avarex.
+
+
+
 avare
 =====
 
+Note: A more modern multi platofrm version of Avare is available as AvareX on Android Play Store, Apple App Store, Windows App Store, and Linux Snapcraft Store.
+
 Avare Aviation GPS for Android. Avare is pronounced "Ah-vAir" - like "aware" with a "v" and can be manually installed from our servers (see our website).
 
 Download from the Google Play Store: https://play.google.com/store/apps/details?id=com.ds.avare&hl=en

app/build.gradle

@@ -2,13 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 android {
-    compileSdkVersion 33
-    buildToolsVersion '33.0.2'
+    compileSdk 35
+    buildToolsVersion '34.0.0'
 
     defaultConfig {
         applicationId "com.ds.avare"
-        minSdkVersion 20 // android 5 is minimum
-        targetSdkVersion 33
+        // RevenueCat Paywalls (purchases-ui) requires API 24 (Android 7.0)
+        minSdkVersion 24
+        targetSdk 35
     }
 
     compileOptions {
@@ -41,6 +42,22 @@ android {
     useLibrary 'android.test.mock'
     namespace 'com.ds.avare'
 
+    // 16 KB page-size workaround. The prebuilt
+    // libdatastore_shared_counter.so in androidx.datastore-core 1.1.x /
+    // 1.2.x ships with a 4 KB-aligned RELRO segment that fails to load
+    // on Android devices using 16 KB memory pages, which crashed the
+    // Play Console pre-launch lab with
+    //   NoClassDefFoundError: Landroidx/datastore/DataStoreFile;
+    // The native lib is only required for cross-process DataStore, which
+    // neither Avare nor RevenueCat use, so excluding it lets DataStore
+    // fall back to its JVM file-lock path.
+    // Tracking: https://issuetracker.google.com/issues/476745201
+    packaging {
+        jniLibs {
+            excludes += ['**/libdatastore_shared_counter.so']
+        }
+    }
+
     applicationVariants.all { variant ->
         def productFlavor = variant.productFlavors[0] != null ? "${variant.productFlavors[0].name.capitalize()}" : ""
         def buildType = "${variant.buildType.name.capitalize()}"
@@ -53,15 +70,32 @@ dependencies {
     implementation 'oro:oro:2.0.8'
     implementation 'org.xmlunit:xmlunit-matchers:2.3.0'
     implementation 'androidx.core:core:1.3.2'
-    implementation 'com.google.firebase:firebase-analytics:17.2.2'
-    implementation 'com.google.firebase:firebase-crashlytics:18.2.6'
     implementation 'com.github.mik3y:usb-serial-for-android:3.4.6'
+    implementation 'androidx.exifinterface:exifinterface:1.3.7'
+
+    // Firebase (BoM-managed). Mirrors avarex: Firebase Auth backs the
+    // RevenueCat user identity. google-services.json must be present.
+    implementation platform('com.google.firebase:firebase-bom:34.13.0')
+    implementation 'com.google.firebase:firebase-analytics'
+    implementation 'com.google.firebase:firebase-crashlytics'
+    implementation 'com.google.firebase:firebase-auth'
+
+    // FirebaseUI Auth provides the email sign-in / register screen used by
+    // ProActivity (same UX as avarex's LoginScreen).
+    implementation 'com.firebaseui:firebase-ui-auth:9.1.1'
+
+    // AppCompat for the Pro/Login screen + activity result APIs
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.activity:activity:1.9.3'
+
+    // RevenueCat core SDK + Paywalls UI (optional subscriptions, mirrors avarex setup)
+    implementation 'com.revenuecat.purchases:purchases:9.29.0'
+    implementation 'com.revenuecat.purchases:purchases-ui:9.29.0'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:4.8.1'
     testImplementation 'org.powermock:powermock-module-junit4:1.7.0RC2'
     testImplementation 'org.powermock:powermock-api-mockito2:1.7.0RC2'
     testImplementation 'org.powermock:powermock-classloading-xstream:1.7.0RC2'
     testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.0RC2'
-    testImplementation 'org.robolectric:robolectric:4.3'
     testImplementation 'org.json:json:20220924'
 }

app/src/main/AndroidManifest.xml

@@ -11,8 +11,8 @@ Redistribution and use in source and binary forms, with or without modification,
     *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="381"
-    android:versionName="10.3.1"
+    android:versionCode="414"
+    android:versionName="11.1.4"
     android:installLocation="auto">
 
     <!-- Network State Permissions to detect Internet status -->
@@ -38,6 +38,15 @@ Redistribution and use in source and binary forms, with or without modification,
     <uses-permission android:name="android.permission.READ_INTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_INTERNAL_STORAGE" />
 
+    <!--
+        Required by Firebase Analytics / Play Services on apps targeting
+        SDK 33+ that consume the Android Advertising ID. Matches the
+        "uses advertising ID" declaration in the Play Console; without
+        it the SDK returns a zeroed-out ad id and Play Console flags a
+        release warning.
+    -->
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID" />
+
     <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
     <uses-feature android:name="android.hardware.wifi" android:required="false" />
 
@@ -111,6 +120,10 @@ Redistribution and use in source and binary forms, with or without modification,
         <activity android:name=".PfdActivity"/>
         <activity android:name=".RegisterActivity"/>
         <activity android:name=".ThreeDActivity"/>
+        <activity
+            android:name=".ProActivity"
+            android:label="@string/ProServicesTitle"
+            android:theme="@style/Theme.AppCompat.NoActionBar"/>
         <activity
             android:name="com.ds.avare.MainActivity"
             android:launchMode="singleTask"