From bf039c1e64d466fdc23dd7762acbbe961a070610 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 29 Oct 2021 21:37:42 -0700 Subject: Upgrade gradle plugin --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 54dd150..55d17e9 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0-beta05' + classpath 'com.android.tools.build:gradle:7.0.2' classpath 'com.google.gms:google-services:4.3.8' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" -- cgit v1.2.3 From 60030ac7a4afce24d4ddc238317dd8df06dcbaa1 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 25 Dec 2021 12:09:45 -0800 Subject: Update project files --- app/build.gradle | 4 ++-- build.gradle | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5b4aeac..70ce239 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,9 +30,9 @@ dependencies { implementation 'com.google.android.material:material:1.4.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'androidx.preference:preference-ktx:1.1.1' - implementation 'androidx.core:core-ktx:1.6.0' + implementation 'androidx.core:core-ktx:1.7.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - googleImplementation platform('com.google.firebase:firebase-bom:28.2.1') + googleImplementation platform('com.google.firebase:firebase-bom:29.0.3') googleImplementation 'com.google.firebase:firebase-core' googleImplementation 'com.google.firebase:firebase-analytics' googleImplementation 'com.google.firebase:firebase-crashlytics' diff --git a/build.gradle b/build.gradle index 55d17e9..accd7b7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ buildscript { - ext.kotlin_version = '1.5.21' + ext.kotlin_version = '1.6.0' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' - classpath 'com.google.gms:google-services:4.3.8' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' + classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.google.gms:google-services:4.3.10' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } -- cgit v1.2.3 From a207f4b9f2ae815f99e19174d5efdf0ba3440e6f Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 25 Dec 2021 15:44:26 -0800 Subject: Handle server change --- app/src/main/java/org/traccar/manager/MainFragment.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/traccar/manager/MainFragment.kt b/app/src/main/java/org/traccar/manager/MainFragment.kt index d5144f5..0f223d0 100644 --- a/app/src/main/java/org/traccar/manager/MainFragment.kt +++ b/app/src/main/java/org/traccar/manager/MainFragment.kt @@ -51,8 +51,13 @@ class MainFragment : WebViewFragment() { inner class AppInterface { @JavascriptInterface fun postMessage(message: String) { - if (message.contains("login")) { + if (message.startsWith("login")) { broadcastManager.sendBroadcast(Intent(EVENT_LOGIN)) + } else if (message.startsWith("server")) { + val url = message.substring(7) + PreferenceManager.getDefaultSharedPreferences(activity) + .edit().putString(MainActivity.PREFERENCE_URL, url).apply() + activity.runOnUiThread { webView.loadUrl(url) } } } } @@ -138,7 +143,7 @@ class MainFragment : WebViewFragment() { private var geolocationRequestOrigin: String? = null private var geolocationCallback: GeolocationPermissions.Callback? = null - private val webChromeClient: WebChromeClient = object : WebChromeClient() { + private val webChromeClient = object : WebChromeClient() { override fun onGeolocationPermissionsShowPrompt(origin: String, callback: GeolocationPermissions.Callback) { geolocationRequestOrigin = null -- cgit v1.2.3 From 11469d3c94fb8b848aa278383f250a4edbf98f39 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 25 Dec 2021 15:45:11 -0800 Subject: Update app version --- app/build.gradle | 8 ++++---- app/src/main/AndroidManifest.xml | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 70ce239..ff99eea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,14 +2,14 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { applicationId 'org.traccar.manager' minSdkVersion 19 - targetSdkVersion 30 - versionCode 28 - versionName '2.17' + targetSdkVersion 31 + versionCode 29 + versionName '2.18' } compileOptions { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7931b2b..63add42 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ package="org.traccar.manager"> + -- cgit v1.2.3 From d8a469bf1ee7bf13be14fcc16df2380a02969083 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 25 Dec 2021 15:53:01 -0800 Subject: Fix warnings --- app/src/main/java/org/traccar/manager/MainFragment.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/traccar/manager/MainFragment.kt b/app/src/main/java/org/traccar/manager/MainFragment.kt index 0f223d0..bb8ade8 100644 --- a/app/src/main/java/org/traccar/manager/MainFragment.kt +++ b/app/src/main/java/org/traccar/manager/MainFragment.kt @@ -152,7 +152,7 @@ class MainFragment : WebViewFragment() { if (ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_FINE_LOCATION)) { AlertDialog.Builder(activity) .setMessage(R.string.permission_location_rationale) - .setNeutralButton(android.R.string.ok) { dialog: DialogInterface?, which: Int -> + .setNeutralButton(android.R.string.ok) { _: DialogInterface?, _: Int -> geolocationRequestOrigin = origin geolocationCallback = callback ActivityCompat.requestPermissions( @@ -177,6 +177,7 @@ class MainFragment : WebViewFragment() { } // Android 4.1+ + @Suppress("UNUSED_PARAMETER") fun openFileChooser(uploadMessage: ValueCallback?, acceptType: String?, capture: String?) { openFileCallback = uploadMessage val intent = Intent(Intent.ACTION_GET_CONTENT) -- cgit v1.2.3 From c54805ed3ac40f36cefcd74232795e73a4151521 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Sat, 25 Dec 2021 15:58:06 -0800 Subject: Fix manifest --- app/src/google/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/google/AndroidManifest.xml b/app/src/google/AndroidManifest.xml index c9b855e..468e5b7 100644 --- a/app/src/google/AndroidManifest.xml +++ b/app/src/google/AndroidManifest.xml @@ -21,7 +21,7 @@ android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/ic_stat_notify" /> - + -- cgit v1.2.3 From 188440d551e1281cf48b3addbfa328bb1f8b48dc Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 28 Dec 2021 20:54:15 -0800 Subject: Fix crash issue --- .../google/java/org/traccar/manager/ManagerMessagingService.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt b/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt index 165de63..a298591 100644 --- a/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt +++ b/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt @@ -19,6 +19,7 @@ import android.annotation.SuppressLint import android.app.NotificationManager import android.app.PendingIntent import android.content.Intent +import android.os.Build import androidx.core.app.NotificationCompat import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage @@ -28,7 +29,12 @@ class ManagerMessagingService : FirebaseMessagingService() { @SuppressLint("UnspecifiedImmutableFlag") override fun onMessageReceived(remoteMessage: RemoteMessage) { super.onMessageReceived(remoteMessage) - val pendingIntent = PendingIntent.getActivity(this, 0, Intent(this, MainActivity::class.java), PendingIntent.FLAG_ONE_SHOT) + val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE + } else { + PendingIntent.FLAG_ONE_SHOT + } + val pendingIntent = PendingIntent.getActivity(this, 0, Intent(this, MainActivity::class.java), flags) val builder = NotificationCompat.Builder(this, getString(R.string.notification_channel_id)) .setSmallIcon(R.drawable.ic_stat_notify) .setContentTitle(getString(R.string.app_name)) -- cgit v1.2.3 From e8247f785fcacbebff9801464de025b0e16b52b3 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 28 Dec 2021 20:54:42 -0800 Subject: Update version number --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ff99eea..04ecb3f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId 'org.traccar.manager' minSdkVersion 19 targetSdkVersion 31 - versionCode 29 - versionName '2.18' + versionCode 30 + versionName '2.19' } compileOptions { -- cgit v1.2.3