Merge pull request #144 from pachi81/develop

Develop

auto/build.gradle

@@ -3,6 +3,8 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
+project.ext.set("releasePath", "D:/Daten/Michel/OneDrive/Projekte/Release")
+
 android {
     namespace 'de.michelinside.glucodataauto'
     compileSdk rootProject.compileSdk
@@ -12,7 +14,7 @@ android {
         minSdk rootProject.minSdk
         targetSdk rootProject.targetSdk
         versionCode 1025
-        versionName "0.9.10"
+        versionName "1.0-beta1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -29,6 +31,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-dev-rules.pro'
             versionNameSuffix '-dev'
             resValue "string", "app_name", "GlucoDataAuto"
+            signingConfig signingConfigs.debug
         }
         debug {
             minifyEnabled false
@@ -69,9 +72,9 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.joaomgcd:taskerpluginlibrary:0.4.4'
     implementation project(path: ':common')

auto/proguard-dev-rules.pro

@@ -0,0 +1,32 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+-dontwarn **
+-keep class **
+-keepclassmembers class *{*;}
+-keepattributes *
+
+# --------------------------------------------------------------------
+# REMOVE all debug log messages
+# --------------------------------------------------------------------
+-assumenosideeffects class android.util.Log {
+    public static *** v(...);
+}

auto/src/main/AndroidManifest.xml

@@ -48,7 +48,7 @@
                 android:value="" />
         </activity>
         <activity
-            android:name=".SettingsActivity"
+            android:name=".preferences.SettingsActivity"
             android:label="@string/menu_settings"
             android:parentActivityName=".MainActivity"
             tools:ignore="LockedOrientationActivity">
@@ -104,6 +104,8 @@
             </intent-filter>
         </receiver>
         <receiver android:name="de.michelinside.glucodatahandler.common.tasks.TimeAlarmReceiver" />
+        <receiver android:name="de.michelinside.glucodatahandler.common.tasks.SourceAlarmReceiver" />
+        <receiver android:name="de.michelinside.glucodatahandler.common.receiver.InternalActionReceiver" />
 
         <service
             android:name=".android_auto.CarMediaBrowserService"

auto/src/main/java/de/michelinside/glucodataauto/GlucoDataServiceAuto.kt

@@ -20,8 +20,9 @@ import de.michelinside.glucodatahandler.common.notification.Channels
 import de.michelinside.glucodatahandler.common.notifier.InternalNotifier
 import de.michelinside.glucodatahandler.common.notifier.NotifySource
 import de.michelinside.glucodatahandler.common.tasks.BackgroundWorker
+import de.michelinside.glucodatahandler.common.tasks.SourceTaskService
 import de.michelinside.glucodatahandler.common.tasks.TimeTaskService
-import de.michelinside.glucodatahandler.common.utils.Utils
+import de.michelinside.glucodatahandler.common.utils.PackageUtils
 
 class GlucoDataServiceAuto: Service() {
     companion object {
@@ -37,7 +38,8 @@ class GlucoDataServiceAuto: Service() {
             if(!init) {
                 Log.v(LOG_ID, "init called")
                 GlucoDataService.context = context
-                TimeTaskService.useWorker = true
+                //TimeTaskService.useWorker = true
+                //SourceTaskService.useWorker = true
                 ReceiveData.initData(context)
                 CarConnection(context.applicationContext).type.observeForever(GlucoDataServiceAuto::onConnectionStateUpdated)
                 init = true
@@ -91,8 +93,9 @@ class GlucoDataServiceAuto: Service() {
         fun startDataSync(context: Context) {
             try {
                 if (dataSyncCount == 0) {
-                    Log.d(LOG_ID, "startDataSync")
+                    Log.d(LOG_ID, "startDataSync count: $dataSyncCount")
                     TimeTaskService.run(context)
+                    SourceTaskService.run(context)
                     sendStateBroadcast(context, true)
                 }
                 dataSyncCount++
@@ -196,7 +199,7 @@ class GlucoDataServiceAuto: Service() {
     private fun getNotification(): Notification {
         Channels.createNotificationChannel(this, ChannelType.ANDROID_AUTO_FOREGROUND)
 
-        val pendingIntent = Utils.getAppIntent(this, MainActivity::class.java, 11, false)
+        val pendingIntent = PackageUtils.getAppIntent(this, MainActivity::class.java, 11, false)
 
         return Notification.Builder(this, ChannelType.ANDROID_AUTO_FOREGROUND.channelId)
             .setContentTitle(getString(de.michelinside.glucodatahandler.common.R.string.activity_main_car_connected_label))