From 3b90adaf353363e900a3afad0a97ab6d8fe57c3b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 22 Sep 2019 17:34:05 -0700
Subject: Target Android 10

---
 app/build.gradle                                        | 17 ++++++++---------
 app/src/google/AndroidManifest.xml                      |  3 ++-
 .../java/org/traccar/manager/GoogleMainApplication.java |  2 +-
 .../org/traccar/manager/ManagerMessagingService.java    |  2 +-
 app/src/main/AndroidManifest.xml                        |  4 +++-
 app/src/main/java/org/traccar/manager/MainActivity.java |  2 +-
 app/src/main/java/org/traccar/manager/MainFragment.java |  5 ++---
 .../main/java/org/traccar/manager/StartFragment.java    |  2 ++
 build.gradle                                            |  4 ++--
 gradle.properties                                       |  2 ++
 gradle/wrapper/gradle-wrapper.properties                |  2 +-
 11 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 gradle.properties

diff --git a/app/build.gradle b/app/build.gradle
index a7090fd..5ef19dd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.2'
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId 'org.traccar.manager'
         minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 18
-        versionName '2.8'
+        targetSdkVersion 29
+        versionCode 19
+        versionName '2.9'
     }
 
     flavorDimensions 'default'
@@ -20,10 +19,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:design:28.0.0-rc02'
-    googleImplementation 'com.google.firebase:firebase-core:16.0.3'
-    googleImplementation 'com.google.firebase:firebase-messaging:17.3.2'
-    googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
+    implementation 'com.google.android.material:material:1.0.0'
+    googleImplementation 'com.google.firebase:firebase-core:17.2.0'
+    googleImplementation 'com.google.firebase:firebase-messaging:20.0.0'
+    googleImplementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains('Google')) {
diff --git a/app/src/google/AndroidManifest.xml b/app/src/google/AndroidManifest.xml
index c0215a1..c9b855e 100644
--- a/app/src/google/AndroidManifest.xml
+++ b/app/src/google/AndroidManifest.xml
@@ -6,7 +6,8 @@
 
     <application
         android:name=".GoogleMainApplication"
-        tools:replace="android:name">
+        tools:replace="android:name"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <meta-data
             android:name="google_analytics_adid_collection_enabled"
diff --git a/app/src/google/java/org/traccar/manager/GoogleMainApplication.java b/app/src/google/java/org/traccar/manager/GoogleMainApplication.java
index 47756aa..fe0c65f 100644
--- a/app/src/google/java/org/traccar/manager/GoogleMainApplication.java
+++ b/app/src/google/java/org/traccar/manager/GoogleMainApplication.java
@@ -23,7 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.analytics.FirebaseAnalytics;
diff --git a/app/src/google/java/org/traccar/manager/ManagerMessagingService.java b/app/src/google/java/org/traccar/manager/ManagerMessagingService.java
index 55a3b06..7548ce5 100644
--- a/app/src/google/java/org/traccar/manager/ManagerMessagingService.java
+++ b/app/src/google/java/org/traccar/manager/ManagerMessagingService.java
@@ -18,7 +18,7 @@ package org.traccar.manager;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7e77594..41cbaf6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.traccar.manager">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -10,7 +11,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:networkSecurityConfig="@xml/network_security_config">
+        android:networkSecurityConfig="@xml/network_security_config"
+        tools:ignore="GoogleAppIndexingWarning">
 
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/java/org/traccar/manager/MainActivity.java b/app/src/main/java/org/traccar/manager/MainActivity.java
index 719ff7c..863ac79 100644
--- a/app/src/main/java/org/traccar/manager/MainActivity.java
+++ b/app/src/main/java/org/traccar/manager/MainActivity.java
@@ -17,7 +17,7 @@ package org.traccar.manager;
 
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 public class MainActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/org/traccar/manager/MainFragment.java b/app/src/main/java/org/traccar/manager/MainFragment.java
index 4642415..b970499 100644
--- a/app/src/main/java/org/traccar/manager/MainFragment.java
+++ b/app/src/main/java/org/traccar/manager/MainFragment.java
@@ -27,8 +27,8 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.MimeTypeMap;
@@ -164,7 +164,6 @@ public class MainFragment extends WebViewFragment {
 
     private WebViewClient webViewClient = new WebViewClient() {
 
-        @SuppressWarnings("deprecation")
         @Override
         public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
             Uri uri = Uri.parse(url);
diff --git a/app/src/main/java/org/traccar/manager/StartFragment.java b/app/src/main/java/org/traccar/manager/StartFragment.java
index ca762f7..c7d5838 100644
--- a/app/src/main/java/org/traccar/manager/StartFragment.java
+++ b/app/src/main/java/org/traccar/manager/StartFragment.java
@@ -15,6 +15,7 @@
  */
 package org.traccar.manager;
 
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Fragment;
 import android.content.DialogInterface;
@@ -54,6 +55,7 @@ public class StartFragment extends Fragment implements View.OnClickListener {
         return view;
     }
 
+    @SuppressLint("StaticFieldLeak")
     @Override
     public void onClick(View view) {
         startButton.setEnabled(false);
diff --git a/build.gradle b/build.gradle
index f67684e..168edf0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.google.gms:google-services:4.0.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.google.gms:google-services:4.3.2'
         classpath 'io.fabric.tools:gradle:1.25.4'
     }
 }
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..5465fec
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8941bfb..01a286e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
-- 
cgit v1.2.3