From 60d385f1f9331999e6607e9713068ba3819c46b9 Mon Sep 17 00:00:00 2001
From: Gerhard Olsson <6248932+gerhardol@users.noreply.github.com>
Date: Thu, 16 Feb 2023 23:37:54 +0100
Subject: [PATCH] F-Droid: update minimum version to Android5/sdk21 (#1134)

* Add lint suppress to common/hrdevice

* F-Droid: update minimum version to Android5/sdk21

Add multidexing by default in free without complicated config.
Appbundles used in Play, not needed there.

* Update to 2.5.0.5

---------

Co-authored-by: Gerhard Olsson <gerhardol@users.noreply.github.com>
---
 app/build.gradle           |  10 +-
 build.gradle               |   4 +-
 common/build.gradle        |   6 +
 common/lint-baseline.xml   |  11 ++
 common/lint.xml            |   8 +
 hrdevice/build.gradle      |   8 +
 hrdevice/lint-baseline.xml | 389 +++++++++++++++++++++++++++++++++++++
 7 files changed, 432 insertions(+), 4 deletions(-)
 create mode 100644 common/lint-baseline.xml
 create mode 100644 common/lint.xml
 create mode 100644 hrdevice/lint-baseline.xml

diff --git a/app/build.gradle b/app/build.gradle
index 4a56e18af..0a766a57c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,7 +39,13 @@ android {
     productFlavors {
         latest {
             dimension "all"
-            minSdkVersion 15
+            if (rootProject.ext.allowNonFree) {
+                // Not required with app bundles(?)
+                minSdkVersion 15
+            } else {
+                // multidexing support
+                minSdkVersion 21
+            }
             compileSdkVersion rootProject.ext.compileSdkVersion
             targetSdkVersion rootProject.ext.targetSdkVersion
             versionName rootProject.ext.versionName
@@ -87,7 +93,7 @@ android {
 
             minifyEnabled rootProject.ext.allowNonFree
             shrinkResources rootProject.ext.allowNonFree
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.txt'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.txt'
             signingConfig signingConfigs.release
         }
     }
diff --git a/build.gradle b/build.gradle
index d4cbc2637..2a1317bd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,8 +30,8 @@ project.ext {
     mockitoVersion = '3.11.2'
 
     //The Git tag for the release must be identical for F-Droid
-    versionName = '2.5.0.4'
-    versionCode = 322
+    versionName = '2.5.0.5'
+    versionCode = 323
     latestBaseVersionCode = 15000000
 
     // F-Droid builds only allow free software (wear dir deleted at builds)
diff --git a/common/build.gradle b/common/build.gradle
index c1f5519a7..def694962 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -35,6 +35,12 @@ android {
     lint {
         showAll true
         warning 'MissingTranslation'
+        baseline file('lint-baseline.xml')
+        lintConfig file('lint.xml')
+        checkReleaseBuilds true
+        lintConfig file('lint.xml')
+        //textOutput 'stdout'
+        textReport true
     }
     namespace 'org.runnerup.common'
 }
diff --git a/common/lint-baseline.xml b/common/lint-baseline.xml
new file mode 100644
index 000000000..ffbfa8a2b
--- /dev/null
+++ b/common/lint-baseline.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.1)" variant="all" version="7.4.1">
+
+    <issue
+        id="IconMissingDensityFolder"
+        message="Missing density variation folders in `src\main\res`: drawable-hdpi, drawable-xhdpi, drawable-xxhdpi">
+        <location
+            file="src/main/res"/>
+    </issue>
+
+</issues>
diff --git a/common/lint.xml b/common/lint.xml
new file mode 100644
index 000000000..c4b210183
--- /dev/null
+++ b/common/lint.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <!-- All translations will not be complete -->
+    <issue id="MissingTranslation" severity="ignore" />
+    <!-- Ignore not cleaned up strings -->
+    <issue id="ExtraTranslation" severity="ignore" />
+    <issue id="PluralsCandidate,UnusedResources,TypographyEllipsis" severity="ignore" />
+</lint>
diff --git a/hrdevice/build.gradle b/hrdevice/build.gradle
index 70f9a0f3d..02746d553 100644
--- a/hrdevice/build.gradle
+++ b/hrdevice/build.gradle
@@ -23,6 +23,14 @@ android {
             assets.srcDirs = ['assets']
         }
     }
+    lint {
+        baseline file('lint-baseline.xml')
+        checkReleaseBuilds true
+        //lintConfig file('lint.xml')
+        showAll true
+        //textOutput 'stdout'
+        textReport true
+    }
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion rootProject.ext.targetSdkVersion
diff --git a/hrdevice/lint-baseline.xml b/hrdevice/lint-baseline.xml
new file mode 100644
index 000000000..73f790af7
--- /dev/null
+++ b/hrdevice/lint-baseline.xml
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.1)" variant="all" version="7.4.1">
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.close: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="            btGatt.close();"
+        errorLine2="            ~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="145"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.discoverServices: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                        boolean res = btGatt.discoverServices();"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="280"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.connect: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                        boolean res = btGatt.connect();"
+        errorLine2="                                      ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="283"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.close: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                        btGatt.close();"
+        errorLine2="                        ~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="293"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.readCharacteristic: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="            if (!btGatt.readCharacteristic(firmwareIdCharc)) {"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="378"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.readDescriptor: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="            if (!btGatt.readDescriptor(mHRMccc)) {"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="406"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.readCharacteristic: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="            if (!btGatt.readCharacteristic(mBLcharac)) {"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="426"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.setCharacteristicNotification: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="        if (!btGatt.setCharacteristicNotification(charac, onoff)) {"
+        errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="441"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.writeDescriptor: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="        return btGatt.writeDescriptor(clientConfig);"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="459"
+            column="16"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.connectGatt: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                    hrClientHandler.post(() -> {"
+        errorLine2="                                    ^">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="486"
+            column="37"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.connectGatt: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                    btGatt = btDevice.connectGatt(context, false, btGattCallbacks);"
+        errorLine2="                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="496"
+            column="30"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothAdapter.startLeScan: android.permission.BLUETOOTH_SCAN"
+        errorLine1="            btAdapter.startLeScan(mLeScanCallback);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="532"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothAdapter.getBondedDevices: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                for (BluetoothDevice btDeviceThis : btAdapter.getBondedDevices()) {"
+        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="535"
+            column="53"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.getType: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                    if (btDeviceThis.getType() != BluetoothDevice.DEVICE_TYPE_LE) {"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="536"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.getName: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                        log(&quot;Ignoring paired non BLE device: &quot; + btDeviceThis.getName());"
+        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="537"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.getName: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                    log(&quot;Trying paired generic BLE device: &quot; + btDeviceThis.getName());"
+        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="542"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothAdapter.startLeScan: android.permission.BLUETOOTH_SCAN"
+        errorLine1="            btAdapter.startLeScan(SCAN_UUIDS, mLeScanCallback);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="546"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothAdapter.stopLeScan: android.permission.BLUETOOTH_SCAN"
+        errorLine1="            btAdapter.stopLeScan(mLeScanCallback);"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="554"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.getName: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="        if (ref.deviceName == null || dev.getName() == null"
+        errorLine2="                                      ~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="584"
+            column="39"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.getName: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                || !dev.getName().contentEquals(ref.deviceName)) {"
+        errorLine2="                    ~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="585"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.connectGatt: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="        btGatt = btDevice.connectGatt(context, false, btGattCallbacks);"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="596"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.disconnect: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="            btGatt.disconnect();"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="619"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.close: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="            btGatt.close();"
+        errorLine2="            ~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="620"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.disconnect: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="        btGatt.disconnect();"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="664"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.close: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                    copy.close();"
+        errorLine2="                    ~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="683"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothGatt.close: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                copy.close();"
+        errorLine2="                ~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/AndroidBLEHRProvider.java"
+            line="691"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by intent BluetoothAdapter.ACTION_REQUEST_ENABLE: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="        activity.startActivityForResult(new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE),"
+        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/Bt20Base.java"
+            line="67"
+            column="18"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothAdapter.getBondedDevices: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="            Set&lt;BluetoothDevice> list = new HashSet&lt;>(btAdapter.getBondedDevices());"
+        errorLine2="                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/Bt20Base.java"
+            line="209"
+            column="55"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.createRfcommSocketToServiceRecord: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                sock = device.createRfcommSocketToServiceRecord(MY_UUID);"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/Bt20Base.java"
+            line="320"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.createInsecureRfcommSocketToServiceRecord: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="                sock = device.createInsecureRfcommSocketToServiceRecord(MY_UUID);"
+        errorLine2="                       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/Bt20Base.java"
+            line="323"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothSocket.connect: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="            sock.connect();"
+        errorLine2="            ~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/Bt20Base.java"
+            line="346"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.getName: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="            setName(&quot;ConnectThread-&quot; + device.getName());"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/Bt20Base.java"
+            line="364"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothAdapter.cancelDiscovery: android.permission.BLUETOOTH_SCAN"
+        errorLine1="            btAdapter.cancelDiscovery();"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/Bt20Base.java"
+            line="407"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="MissingPermission"
+        message="Missing permissions required by BluetoothDevice.getName: android.permission.BLUETOOTH_CONNECT"
+        errorLine1="        return HRDeviceRef.create(providerName, device.getName(), device.getAddress());"
+        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/Bt20Base.java"
+            line="804"
+            column="28"/>
+    </issue>
+
+    <issue
+        id="ObsoleteSdkInt"
+        message="Unnecessary; SDK_INT is always >= 10"
+        errorLine1="@TargetApi(Build.VERSION_CODES.GINGERBREAD_MR1)"
+        errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/org/runnerup/hr/Bt20Base.java"
+            line="47"
+            column="1"/>
+    </issue>
+
+</issues>