From 05114053e3b4e13ec369113299c65ac1c250d613 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 27 Jul 2021 09:12:42 -0700
Subject: Handle redirects in the app

---
 app/build.gradle                                      | 4 ++--
 app/src/main/java/org/traccar/manager/MainFragment.kt | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/build.gradle b/app/build.gradle
index 1a17eab..5b4aeac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId 'org.traccar.manager'
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 27
-        versionName '2.16'
+        versionCode 28
+        versionName '2.17'
     }
 
     compileOptions {
diff --git a/app/src/main/java/org/traccar/manager/MainFragment.kt b/app/src/main/java/org/traccar/manager/MainFragment.kt
index 3f09e56..d5144f5 100644
--- a/app/src/main/java/org/traccar/manager/MainFragment.kt
+++ b/app/src/main/java/org/traccar/manager/MainFragment.kt
@@ -36,6 +36,7 @@ import android.webkit.JavascriptInterface
 import android.webkit.ValueCallback
 import android.webkit.WebChromeClient
 import android.webkit.WebView
+import android.webkit.WebViewClient
 import android.webkit.WebViewFragment
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
@@ -68,6 +69,7 @@ class MainFragment : WebViewFragment() {
         if ((activity.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
             WebView.setWebContentsDebuggingEnabled(true)
         }
+        webView.webViewClient = WebViewClient() // handle redirects in the app
         webView.webChromeClient = webChromeClient
         webView.addJavascriptInterface(AppInterface(), "appInterface")
         val webSettings = webView.settings
-- 
cgit v1.2.3