Merge pull request #74 from Semper-Viventem/master

Release 0.20.3-beta

app/build.gradle.kts

@@ -24,7 +24,7 @@ android {
         minSdk = 29
         targetSdk = 34
         versionCode = (System.currentTimeMillis() / 1000).toInt()
-        versionName = "0.20.2-beta"
+        versionName = "0.20.3-beta"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/f/cking/software/service/BgScanService.kt

@@ -3,18 +3,29 @@ package f.cking.software.service
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ServiceInfo
 import android.os.Handler
 import android.os.IBinder
 import android.os.Looper
-import f.cking.software.data.helpers.*
+import f.cking.software.data.helpers.BleScannerHelper
+import f.cking.software.data.helpers.LocationProvider
+import f.cking.software.data.helpers.NotificationsHelper
+import f.cking.software.data.helpers.PermissionHelper
+import f.cking.software.data.helpers.PowerModeHelper
 import f.cking.software.domain.interactor.AnalyseScanBatchInteractor
 import f.cking.software.domain.interactor.CheckProfileDetectionInteractor
 import f.cking.software.domain.interactor.SaveReportInteractor
 import f.cking.software.domain.interactor.SaveScanBatchInteractor
 import f.cking.software.domain.model.BleScanDevice
 import f.cking.software.domain.model.JournalEntry
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Runnable
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
 import timber.log.Timber
 
@@ -85,7 +96,8 @@ class BgScanService : Service() {
                 notificationsHelper.buildForegroundNotification(
                     NotificationsHelper.ServiceNotificationContent.NoDataYet,
                     createCloseServiceIntent(this)
-                )
+                ),
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE or ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION,
             )
 
             permissionHelper.checkBlePermissions(

app/src/main/res/drawable/ic_monochrome.xml

@@ -0,0 +1,11 @@
+<vector android:height="100dp" android:viewportHeight="1000"
+    android:viewportWidth="1000" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000"
+        android:pathData="M465.9,15c-55.1,4.9 -106.9,18 -154.3,39 -11.5,5.1 -13.1,6.1 -13.4,8.4 -0.2,1.4 -1.2,3.1 -2.3,3.6 -1.7,1 -1.9,2.3 -1.9,16.5l0,15.4 -3,1.6c-1.6,0.8 -3.1,1.5 -3.5,1.5 -0.3,-0 -0.5,-7.9 -0.5,-17.5 0,-9.6 -0.2,-17.5 -0.5,-17.5 -0.3,-0 -4.3,2.1 -9,4.6l-8.5,4.6 0,-10.6c0,-5.8 -0.4,-10.6 -0.8,-10.6 -0.8,-0 -22.4,13.1 -31.4,19 -2.5,1.7 -3.8,3.3 -3.8,4.7 0,1.3 -0.9,2.8 -2,3.5 -1.8,1.1 -2,2.4 -2,10.3l0,9 -10.7,8c-18.5,13.7 -34.1,27.3 -52.5,45.6l-17.7,17.7 -0.3,-7.2 -0.3,-7.1 -4.5,5.6c-20.3,25.1 -21,26.2 -21,34.9 0,6.4 -0.2,7.1 -4.3,12.6 -36.9,50.2 -66.3,112.3 -81.2,171.7 -3.9,15.3 -10.5,49.1 -10.5,53.4 0,1 2.4,1.3 8.6,1.3 8.4,-0 8.6,-0 8.1,2.2 -0.3,1.3 -1.1,8.6 -1.7,16.3 -0.6,7.7 -1.4,15.9 -1.6,18.2l-0.5,4.3 -6.5,-0 -6.4,-0 0,3.5c0,2.8 -0.4,3.5 -2,3.5 -1.9,-0 -2,0.7 -2,17.2 0,41.2 6,85.1 16.8,124l1.9,6.8 -16.3,-0c-9.5,-0 -16.4,0.4 -16.4,0.9 0,0.5 0.4,2.1 1,3.5 0.9,2.4 0.8,2.6 -2,2.6 -1.7,-0 -3,0.2 -3,0.5 0,0.3 1.8,6 4.1,12.8 5.2,15.6 13.3,35.5 21.1,51.8l6.1,12.9 19.9,-0c10.9,-0 19.8,0.4 19.8,0.8 0,1.3 14.8,27 22.3,38.7 9.8,15.2 23.3,33.8 35.1,48 13,15.7 46.8,49.5 62.4,62.3 12.2,10.1 32.4,25.2 33.6,25.2 0.3,-0 0.6,-2.1 0.6,-4.7 0,-3.7 0.3,-4.4 1.2,-3.5 2.1,2.1 2.7,1.3 3,-4.4l0.3,-5.5 9.5,6.1c5.2,3.4 12.3,7.7 15.8,9.8l6.2,3.6 0,11.1 0,11 9,4.8 9,4.8 0,18 0,17.9 5,2.5c2.7,1.4 5.2,2.5 5.5,2.5 0.3,-0 0.5,-1.8 0.5,-4.1 0,-3.6 0.2,-4 2,-3.4 1.9,0.6 2,0.2 2,-12.4 0,-7.2 0.3,-13.1 0.6,-13.1 0.3,-0 5.3,2.1 11.1,4.6 47.5,20.7 105.7,35.1 153.3,38l11,0.7 0,-3.6c0,-3 0.4,-3.7 2,-3.7 1.6,-0 2,-0.7 2,-3.5l0,-3.5 8,-0 8,-0 0,7.7 0,7.6 21.8,-0.6c51.9,-1.5 100.9,-11 150.5,-29.1 11.9,-4.3 35.3,-14.4 45.9,-19.7 7.1,-3.6 8.4,-3.9 15.8,-3.9 9.3,-0 10.3,-0.4 30.8,-12.7 16.1,-9.6 30.9,-19.4 44,-29.2 8.7,-6.4 10,-7.7 8.1,-8.1 -2,-0.5 -1.8,-0.8 2.1,-3.5l4.4,-3 -5.4,-0.5 -5.3,-0.5 6.9,-5.9c13.3,-11.3 37.5,-34.9 36.5,-35.6 -0.7,-0.4 0.1,-1.8 2,-3.6l3,-2.9 -7.3,-0.6 -7.3,-0.5 9.1,-0.2 9.1,-0.2 6.5,-7.8c3.6,-4.2 9.7,-11.8 13.7,-16.9l7.2,-9.2 6.7,-0.3 6.6,-0.3 6.8,-9.5c6.5,-9.2 15.8,-24.1 15.8,-25.4 0,-0.3 -2.5,-0.6 -5.6,-0.6 -4.1,-0 -5.5,-0.3 -5.1,-1.2 0.2,-0.7 3.6,-6.9 7.6,-13.8 4.3,-7.6 6.7,-12.8 6.1,-13.4 -0.5,-0.5 -0.6,-2.2 -0.3,-3.7 0.5,-2.6 0.3,-2.9 -2.1,-2.9 -1.4,-0 -2.6,-0.5 -2.6,-1 0,-0.6 -5.3,-1 -13.9,-1l-14,-0 5.8,-12.3c6.7,-14.2 16.7,-38.6 20.6,-50.4l2.7,-8.3 18.8,-0 18.8,-0 0.7,-3c0.4,-1.6 1.3,-3.3 2,-3.7 2.8,-1.6 13.1,-45 17,-71.5 2.6,-18 4.5,-43.4 4.5,-60.6l0,-16.2 6.5,-0 6.5,-0 0,-3.5c0,-2.3 0.5,-3.5 1.4,-3.5 0.9,-0 1.6,-1.7 2,-4.5 0.7,-4.1 -0.5,-23.6 -2.2,-37.5l-0.7,-5.5 -8.6,-0.3 -8.5,-0.3 -1.2,-8.7c-1.9,-13.5 -7.8,-41.3 -11.7,-55.5 -1.9,-7 -3.5,-13 -3.5,-13.2 0,-0.3 0.7,-0.5 1.5,-0.5 1.2,-0 1.5,-1.6 1.5,-8.5 0,-9.4 -2.1,-16.2 -12,-39.4l-5.2,-12.1 -4.7,-0 -4.6,-0 -3.3,-7.3c-4.7,-10.5 -18.9,-35.8 -28.3,-50.5 -15.3,-24 -33.5,-47.4 -54,-69.5l-10.1,-10.7 -13.5,-0 -13.5,-0 -11.1,-10.4c-6.2,-5.8 -15.9,-14.4 -21.7,-19.2 -10.2,-8.5 -32.4,-25.4 -33.5,-25.4 -0.2,-0 -1.4,-0.8 -2.5,-1.8 -1.1,-0.9 -7.5,-5.2 -14.1,-9.4l-12,-7.7 4.8,-0.3 4.8,-0.3 -5.8,-3 -5.7,-3 7.7,-0.5 7.8,-0.5 -18.5,-9.2c-50.8,-25.2 -98.8,-39.3 -159.5,-46.9 -15,-1.9 -75.8,-2.8 -91.6,-1.4zM466.6,200.9c44.5,35 87.5,69.2 89.2,70.8 2.5,2.4 4.2,1.5 4.2,-2.2 0,-2.6 0.3,-3.3 1.5,-2.9 1.3,0.5 1.5,-2.1 1.5,-20l0,-20.6 4.5,-0c4.3,-0 4.5,0.1 4.5,3 0,2.3 -0.4,3 -2,3 -1.9,-0 -2,0.7 -2,24.2l0.1,24.3 16.7,13.2c9.2,7.3 18,14.4 19.6,15.8 1.6,1.4 3.3,2.5 3.8,2.5 0.4,-0 0.8,0.4 0.8,0.9 0,0.5 -1.8,1.1 -4,1.5 -2.2,0.3 -4,1 -4,1.5 0,0.5 2.4,2.7 5.3,4.9 2.9,2.2 7.4,5.7 9.9,7.8 2.5,2.2 5.4,4.6 6.4,5.4 1.1,0.8 5.4,4.3 9.7,7.7l7.8,6.3 6.8,-0c6.6,-0 7,0.2 10.7,3.8 2.2,2.1 10.1,8.7 17.7,14.7 7.5,5.9 13.7,11.2 13.7,11.6 0,0.4 -0.9,1.4 -2.1,2.2 -2.1,1.5 -16.1,14.5 -23.6,22 -4.2,4 -4.3,4.3 -4.3,10.7l0,6.5 -8.2,8.3c-9.2,9.2 -9.3,10.2 -0.5,10.2 5.2,-0 5.9,1 2.4,3.3 -1.2,0.8 -6.5,5.7 -11.7,10.8 -5.3,5.2 -11.6,11.2 -14,13.3 -2.5,2.2 -8.2,7.4 -12.7,11.6l-8.1,7.7 -17.1,0.8 -17,0.7 -5.5,4.6c-6.3,5.4 -6.9,8 -2.9,11.2 2.5,2 19.4,17.7 41.8,39 5.5,5.2 13.8,13.1 18.5,17.5 4.6,4.4 13.7,12.9 20,19 10.5,10 27.7,26 40.3,37.4 5.3,4.9 5.7,6.2 2.3,8.4 -1.3,0.9 -2.9,2.2 -3.7,2.9 -0.8,0.7 -5,4.2 -9.5,7.6l-8.1,6.2 -19.5,-0c-20.8,-0 -20.5,-0.1 -26.4,5.5 -0.6,0.5 -5.9,4.8 -11.9,9.5 -6,4.7 -17.5,13.8 -25.6,20.2 -8.1,6.4 -18.9,14.8 -24.1,18.7 -5.1,3.8 -12,9.2 -15.3,12 -3.3,2.7 -7.7,6.3 -9.7,7.8 -2.1,1.5 -3.8,3.1 -3.8,3.5 0,0.5 8.1,0.8 18,0.8 9.9,-0 18,0.3 18,0.7 0,0.5 -3,3 -6.8,5.8 -7.5,5.5 -16.9,12.9 -45.2,35.4 -10.7,8.6 -19.9,15.9 -20.5,16.3 -0.5,0.4 -3.3,2.7 -6.1,5 -2.8,2.4 -7.5,6.2 -10.5,8.5 -3,2.3 -9.2,7.1 -13.7,10.7 -4.6,3.6 -8.6,6.6 -8.9,6.6 -0.3,-0 -0.3,-20.3 -0.1,-45l0.4,-45.1 -2.5,-0.6c-1.3,-0.3 -10,-0.3 -19.3,-0l-16.9,0.7 0.3,-37.6c0.3,-41.8 -0.1,-39.4 7.5,-39.4 5.6,-0 6.1,-1.4 1.7,-4.4l-3.7,-2.5 -4.1,3.2 -4,3.2 -19.8,0.5 -19.8,0.5 -29.8,29.1 -29.8,29.2 -14.9,-14.2c-8.3,-7.7 -18.1,-17.1 -22,-20.9l-7,-6.8 8.8,-8.4 8.7,-8.5 19.8,-0 19.7,-0.1 9.5,-9.2c10,-9.6 38.9,-36.5 59.5,-55.2 6.6,-6 14.2,-13.2 17,-16 5.1,-5.2 30.7,-29.2 38.3,-35.9l4.2,-3.8 0,-16.9 0,-16.8 8.3,-0.3 8.2,-0.3 0.3,-7.9 0.3,-7.9 -10.3,-9.7c-5.7,-5.3 -13.8,-12.6 -18,-16.3l-7.7,-6.7 -8.6,-0 -8.6,-0 -8.7,-8.3c-4.8,-4.6 -11.8,-11.3 -15.7,-14.8 -3.8,-3.5 -11.7,-10.9 -17.5,-16.4 -5.8,-5.5 -13.9,-13.2 -18.1,-17 -4.1,-3.9 -13.1,-12.2 -19.9,-18.5 -6.8,-6.3 -16.2,-15.2 -20.9,-19.6l-8.5,-8.2 12.1,-12.8c6.7,-7.1 16.7,-17.4 22.2,-22.9l10.1,-10 48.6,49.2c30.8,31.3 49.3,49.3 50.5,49.3 1.6,-0 1.9,-0.6 1.7,-3.8 -0.1,-2 -0.1,-45.7 0,-97l0.2,-93.3 2.3,1.2c1.2,0.7 5.4,3.7 9.3,6.8zM831,325.5l0,26.5 -2.5,-0 -2.5,-0 0,-26.5 0,-26.5 2.5,-0 2.5,-0 0,26.5zM683,327.5l0,12.5 -4.5,-0 -4.5,-0 0,-12.5 0,-12.5 4.5,-0 4.5,-0 0,12.5zM142,334.5l0,5.5 -9,-0 -9,-0 0,-5.5 0,-5.5 9,-0 9,-0 0,5.5zM715,766l0,11 -4.5,-0 -4.5,-0 0,-11 0,-11 4.5,-0 4.5,-0 0,11zM573,896.5l0,21.5 -6,-0 -6,-0 0,-21.5 0,-21.5 6,-0 6,-0 0,21.5z" android:strokeColor="#00000000"/>
+    <path android:fillColor="#000000"
+        android:pathData="M503.8,323c-0.1,0.5 -0.2,6.4 0,13l0.3,12 6.5,-0 6.5,-0 -0.3,42.5c-0.3,49.1 -1.1,46.2 9.7,37.2 3.4,-2.8 12.4,-10.2 19.9,-16.2 7.5,-6.1 13.6,-11.7 13.6,-12.6 0,-0.9 0.7,-2.2 1.5,-2.9 1.3,-1 1.5,-5.1 1.5,-25.1l0,-23.9 -2.4,-0c-2,-0 -2.5,0.6 -2.8,3l-0.3,3 -4.3,-2.8c-2.3,-1.6 -4,-3.1 -3.7,-3.4 0.3,-0.3 -0.2,-1.1 -1,-1.8 -1.2,-1 -1.9,-1 -2.7,-0.2 -0.7,0.7 -3.3,1.2 -5.9,1.2 -4.1,-0 -5.4,-0.6 -11.1,-5.3 -11.6,-9.3 -16.2,-13.1 -19.3,-15.9 -3.1,-2.9 -5.1,-3.5 -5.7,-1.8z" android:strokeColor="#00000000"/>
+    <path android:fillColor="#000000"
+        android:pathData="M568,384.5c0,22.2 0,22.7 1.9,21.4 8.3,-6 24.1,-19.7 24.1,-20.9 0,-2.1 -9.7,-11 -22.2,-20.4l-3.8,-2.8 0,22.7z" android:strokeColor="#00000000"/>
+    <path android:fillColor="#000000"
+        android:pathData="M516.8,594.7c0.2,16.4 0.1,33.1 -0.3,37l-0.7,7.3 -16.6,-0c-9.2,-0 -17.7,0.3 -18.9,0.6 -2.3,0.6 -2.3,0.8 -2.3,18.5 0,12.4 0.3,17.9 1.1,17.9 0.9,-0 16.3,-11.1 17.9,-12.9 0.3,-0.3 3,-2.6 6,-5.1 3,-2.5 6.4,-5.2 7.5,-6.1 1.1,-0.9 4.7,-3.9 8,-6.5l6,-4.8 19.8,-0.4 19.9,-0.4 10.3,-8.2c5.7,-4.4 10.4,-8.8 10.4,-9.6 0.1,-0.9 -6,-6.7 -13.5,-13 -7.5,-6.3 -14.5,-12.4 -15.6,-13.5 -4.2,-4.4 -4.8,-5.2 -4.8,-6.3 0,-0.6 -2.2,-2.8 -4.9,-4.9 -2.7,-2.1 -8.8,-7.1 -13.5,-11.1 -4.7,-4.1 -9,-7.1 -9.5,-6.8 -0.5,0.4 -1.2,0.2 -1.6,-0.4 -0.3,-0.5 -1.6,-1 -2.8,-1l-2.2,-0 0.3,29.7z" android:strokeColor="#00000000"/>
+</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome>
+        <inset
+            android:drawable="@drawable/ic_monochrome"
+            android:insetLeft="20dp"
+            android:insetTop="20dp"
+            android:insetRight="20dp"
+            android:insetBottom="20dp" />
+    </monochrome>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -2,4 +2,12 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome>
+        <inset
+            android:drawable="@drawable/ic_monochrome"
+            android:insetLeft="20dp"
+            android:insetTop="20dp"
+            android:insetRight="20dp"
+            android:insetBottom="20dp" />
+    </monochrome>
 </adaptive-icon>

app/src/main/res/values-night/themes.xml

@@ -15,5 +15,6 @@
         <!-- Customize your theme here. -->
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:windowBackground">@color/surface_color</item>
     </style>
 </resources>

app/src/main/res/values/themes.xml

@@ -15,5 +15,6 @@
         <!-- Customize your theme here. -->
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowBackground">@color/surface_color</item>
     </style>
 </resources>