diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2021-07-18 12:04:45 -0700 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2021-07-18 12:04:45 -0700 |
commit | a983b2648017bb0069e73c6a5ab07356db3859e5 (patch) | |
tree | f3ab27c39ab45d90c2dcaa7311c2051226291919 | |
parent | 3b399c41ad64e156f363213078c4a983fe93ef4a (diff) | |
download | etbsa-traccar-manager-android-a983b2648017bb0069e73c6a5ab07356db3859e5.tar.gz etbsa-traccar-manager-android-a983b2648017bb0069e73c6a5ab07356db3859e5.tar.bz2 etbsa-traccar-manager-android-a983b2648017bb0069e73c6a5ab07356db3859e5.zip |
Convert to Kotlin
10 files changed, 425 insertions, 471 deletions
diff --git a/app/build.gradle b/app/build.gradle index 7c131c6..f0a4338 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,11 +29,12 @@ android { 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' googleImplementation 'com.google.firebase:firebase-core:19.0.0' googleImplementation 'com.google.firebase:firebase-analytics:19.0.0' googleImplementation 'com.google.firebase:firebase-messaging:22.0.0' googleImplementation 'com.google.firebase:firebase-crashlytics:18.1.0' - implementation "androidx.core:core-ktx:1.6.0" + implementation 'androidx.core:core-ktx:1.6.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/app/src/google/java/org/traccar/manager/GoogleMainApplication.java b/app/src/google/java/org/traccar/manager/GoogleMainApplication.java deleted file mode 100644 index fe0c65f..0000000 --- a/app/src/google/java/org/traccar/manager/GoogleMainApplication.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2017 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.manager; - -import android.app.Application; -import android.app.NotificationChannel; -import android.app.NotificationManager; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.os.Build; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - -import com.google.android.gms.tasks.OnSuccessListener; -import com.google.firebase.analytics.FirebaseAnalytics; -import com.google.firebase.iid.FirebaseInstanceId; -import com.google.firebase.iid.InstanceIdResult; - -public class GoogleMainApplication extends Application { - - private FirebaseAnalytics firebaseAnalytics; - - @Override - public void onCreate() { - super.onCreate(); - firebaseAnalytics = FirebaseAnalytics.getInstance(this); - IntentFilter intentFilter = new IntentFilter(MainFragment.EVENT_LOGIN); - LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - NotificationChannel channel = new NotificationChannel( - getString(R.string.notification_channel_id), getString(R.string.notification_channel), - NotificationManager.IMPORTANCE_DEFAULT); - ((NotificationManager) getSystemService(NOTIFICATION_SERVICE)).createNotificationChannel(channel); - } - } - - private BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() { - @Override - public void onSuccess(InstanceIdResult instanceIdResult) { - broadcastToken(instanceIdResult.getToken()); - } - }); - } - }; - - public void broadcastToken(String token) { - Intent intent = new Intent(MainFragment.EVENT_TOKEN); - intent.putExtra(MainFragment.KEY_TOKEN, token); - LocalBroadcastManager.getInstance(this).sendBroadcast(intent); - } - -} diff --git a/app/src/google/java/org/traccar/manager/GoogleMainApplication.kt b/app/src/google/java/org/traccar/manager/GoogleMainApplication.kt new file mode 100644 index 0000000..cfeaf6e --- /dev/null +++ b/app/src/google/java/org/traccar/manager/GoogleMainApplication.kt @@ -0,0 +1,64 @@ +/* + * Copyright 2017 - 2021 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.manager + +import android.app.Application +import android.app.NotificationChannel +import android.app.NotificationManager +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.os.Build +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import com.google.firebase.analytics.FirebaseAnalytics +import com.google.firebase.messaging.FirebaseMessaging + +class GoogleMainApplication : Application() { + + private lateinit var firebaseAnalytics: FirebaseAnalytics + + override fun onCreate() { + super.onCreate() + firebaseAnalytics = FirebaseAnalytics.getInstance(this) + val intentFilter = IntentFilter(MainFragment.EVENT_LOGIN) + LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, intentFilter) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val channel = NotificationChannel( + getString(R.string.notification_channel_id), + getString(R.string.notification_channel), + NotificationManager.IMPORTANCE_DEFAULT + ) + (getSystemService(NOTIFICATION_SERVICE) as NotificationManager).createNotificationChannel(channel) + } + } + + private val broadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + FirebaseMessaging.getInstance().token.addOnCompleteListener { + if (it.isComplete) { + broadcastToken(it.result) + } + } + } + } + + fun broadcastToken(token: String?) { + val intent = Intent(MainFragment.EVENT_TOKEN) + intent.putExtra(MainFragment.KEY_TOKEN, token) + LocalBroadcastManager.getInstance(this).sendBroadcast(intent) + } +} diff --git a/app/src/google/java/org/traccar/manager/ManagerMessagingService.java b/app/src/google/java/org/traccar/manager/ManagerMessagingService.java deleted file mode 100644 index 7548ce5..0000000 --- a/app/src/google/java/org/traccar/manager/ManagerMessagingService.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2018 Anton Tananaev (anton.tananaev@gmail.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.manager; - -import android.app.NotificationManager; -import android.app.PendingIntent; -import android.content.Intent; -import androidx.core.app.NotificationCompat; - -import com.google.firebase.messaging.FirebaseMessagingService; -import com.google.firebase.messaging.RemoteMessage; - -public class ManagerMessagingService extends FirebaseMessagingService { - - @Override - public void onMessageReceived(RemoteMessage remoteMessage) { - super.onMessageReceived(remoteMessage); - - PendingIntent pendingIntent = PendingIntent.getActivity( - this, 0, new Intent(this, MainActivity.class), PendingIntent.FLAG_ONE_SHOT); - NotificationCompat.Builder builder = new NotificationCompat.Builder(this, getString(R.string.notification_channel_id)) - .setSmallIcon(R.drawable.ic_stat_notify) - .setContentTitle(getString(R.string.app_name)) - .setContentText(remoteMessage.getNotification().getBody()) - .setAutoCancel(true) - .setContentIntent(pendingIntent);; - ((NotificationManager) getSystemService(NOTIFICATION_SERVICE)).notify(remoteMessage.hashCode(), builder.build()); - } - - @Override - public void onNewToken(String token) { - super.onNewToken(token); - - ((GoogleMainApplication) getApplication()).broadcastToken(token); - } - -} diff --git a/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt b/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt new file mode 100644 index 0000000..165de63 --- /dev/null +++ b/app/src/google/java/org/traccar/manager/ManagerMessagingService.kt @@ -0,0 +1,45 @@ +/* + * Copyright 2018 - 2021 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.manager + +import android.annotation.SuppressLint +import android.app.NotificationManager +import android.app.PendingIntent +import android.content.Intent +import androidx.core.app.NotificationCompat +import com.google.firebase.messaging.FirebaseMessagingService +import com.google.firebase.messaging.RemoteMessage + +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 builder = NotificationCompat.Builder(this, getString(R.string.notification_channel_id)) + .setSmallIcon(R.drawable.ic_stat_notify) + .setContentTitle(getString(R.string.app_name)) + .setContentText(remoteMessage.notification?.body) + .setAutoCancel(true) + .setContentIntent(pendingIntent) + (getSystemService(NOTIFICATION_SERVICE) as NotificationManager).notify(remoteMessage.hashCode(), builder.build()) + } + + override fun onNewToken(token: String) { + super.onNewToken(token) + (application as GoogleMainApplication).broadcastToken(token) + } +} diff --git a/app/src/main/java/org/traccar/manager/MainActivity.java b/app/src/main/java/org/traccar/manager/MainActivity.java deleted file mode 100644 index b23e89f..0000000 --- a/app/src/main/java/org/traccar/manager/MainActivity.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2016 - 2021 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.manager; - -import android.app.Fragment; -import android.os.Build; -import android.os.Bundle; -import android.preference.PreferenceManager; - -import androidx.annotation.NonNull; -import androidx.annotation.RequiresApi; -import androidx.appcompat.app.AppCompatActivity; - -public class MainActivity extends AppCompatActivity { - - public static final String PREFERENCE_URL = "url"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - if (savedInstanceState == null) { - initContent(); - } - } - - private void initContent() { - if (PreferenceManager.getDefaultSharedPreferences(this).contains(PREFERENCE_URL)) { - getFragmentManager().beginTransaction().add(android.R.id.content, new MainFragment()).commit(); - } else { - getFragmentManager().beginTransaction().add(android.R.id.content, new StartFragment()).commit(); - } - } - - @RequiresApi(api = Build.VERSION_CODES.M) - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content); - if (fragment != null) { - fragment.onRequestPermissionsResult(requestCode, permissions, grantResults); - } - } -} diff --git a/app/src/main/java/org/traccar/manager/MainActivity.kt b/app/src/main/java/org/traccar/manager/MainActivity.kt new file mode 100644 index 0000000..945b108 --- /dev/null +++ b/app/src/main/java/org/traccar/manager/MainActivity.kt @@ -0,0 +1,52 @@ +/* + * Copyright 2016 - 2021 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@file:Suppress("DEPRECATION") +package org.traccar.manager + +import android.os.Build +import android.os.Bundle +import androidx.annotation.RequiresApi +import androidx.appcompat.app.AppCompatActivity +import androidx.preference.PreferenceManager + +class MainActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + if (savedInstanceState == null) { + initContent() + } + } + + private fun initContent() { + if (PreferenceManager.getDefaultSharedPreferences(this).contains(PREFERENCE_URL)) { + fragmentManager.beginTransaction().add(android.R.id.content, MainFragment()).commit() + } else { + fragmentManager.beginTransaction().add(android.R.id.content, StartFragment()).commit() + } + } + + @RequiresApi(api = Build.VERSION_CODES.M) + override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) { + val fragment = fragmentManager.findFragmentById(android.R.id.content) + fragment?.onRequestPermissionsResult(requestCode, permissions, grantResults) + } + + companion object { + const val PREFERENCE_URL = "url" + } +} diff --git a/app/src/main/java/org/traccar/manager/MainFragment.kt b/app/src/main/java/org/traccar/manager/MainFragment.kt index 1e98b17..8aa0c15 100644 --- a/app/src/main/java/org/traccar/manager/MainFragment.kt +++ b/app/src/main/java/org/traccar/manager/MainFragment.kt @@ -13,206 +13,194 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.traccar.manager; - -import android.Manifest; -import android.annotation.SuppressLint; -import android.app.Activity; -import android.content.ActivityNotFoundException; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; -import android.net.Uri; -import android.os.Build; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.view.View; -import android.webkit.GeolocationPermissions; -import android.webkit.JavascriptInterface; -import android.webkit.ValueCallback; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewFragment; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - -public class MainFragment extends WebViewFragment { - - public final static String EVENT_LOGIN = "eventLogin"; - public final static String EVENT_TOKEN = "eventToken"; - public final static String KEY_TOKEN = "keyToken"; - - private static final int REQUEST_PERMISSIONS_LOCATION = 1; - private final static int REQUEST_FILE_CHOOSER = 1; - - private LocalBroadcastManager broadcastManager; - - public class AppInterface { - +@file:Suppress("DEPRECATION") +package org.traccar.manager + +import android.Manifest +import android.annotation.SuppressLint +import android.app.Activity +import android.content.ActivityNotFoundException +import android.content.BroadcastReceiver +import android.content.Context +import android.content.DialogInterface +import android.content.Intent +import android.content.IntentFilter +import android.content.pm.ApplicationInfo +import android.content.pm.PackageManager +import android.net.Uri +import android.os.Build +import android.os.Bundle +import android.view.View +import android.webkit.GeolocationPermissions +import android.webkit.JavascriptInterface +import android.webkit.ValueCallback +import android.webkit.WebChromeClient +import android.webkit.WebView +import android.webkit.WebViewFragment +import androidx.appcompat.app.AlertDialog +import androidx.core.app.ActivityCompat +import androidx.core.content.ContextCompat +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import androidx.preference.PreferenceManager + +class MainFragment : WebViewFragment() { + + private lateinit var broadcastManager: LocalBroadcastManager + + inner class AppInterface { @JavascriptInterface - public void postMessage(String message) { + fun postMessage(message: String) { if (message.contains("login")) { - broadcastManager.sendBroadcast(new Intent(EVENT_LOGIN)); + broadcastManager.sendBroadcast(Intent(EVENT_LOGIN)) } } - } - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - broadcastManager = LocalBroadcastManager.getInstance(getActivity()); + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + broadcastManager = LocalBroadcastManager.getInstance(activity) } @SuppressLint("SetJavaScriptEnabled") - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) - if ((getActivity().getApplicationInfo().flags &= ApplicationInfo.FLAG_DEBUGGABLE) != 0) { - WebView.setWebContentsDebuggingEnabled(true); + if ((activity.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE) != 0) { + WebView.setWebContentsDebuggingEnabled(true) } - - getWebView().setWebChromeClient(webChromeClient); - getWebView().addJavascriptInterface(new AppInterface(), "appInterface"); - - WebSettings webSettings = getWebView().getSettings(); - webSettings.setJavaScriptEnabled(true); - webSettings.setDomStorageEnabled(true); - webSettings.setDatabaseEnabled(true); - webSettings.setMediaPlaybackRequiresUserGesture(false); - - String url = PreferenceManager.getDefaultSharedPreferences( - getActivity()).getString(MainActivity.PREFERENCE_URL, null); - - getWebView().loadUrl(url); + webView.webChromeClient = webChromeClient + webView.addJavascriptInterface(AppInterface(), "appInterface") + val webSettings = webView.settings + webSettings.javaScriptEnabled = true + webSettings.domStorageEnabled = true + webSettings.databaseEnabled = true + webSettings.mediaPlaybackRequiresUserGesture = false + val url = PreferenceManager.getDefaultSharedPreferences(activity) + .getString(MainActivity.PREFERENCE_URL, null) + url?.let { webView.loadUrl(it) } } - private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - String token = intent.getStringExtra(KEY_TOKEN); - String code = "updateNotificationToken && updateNotificationToken('" + token + "')"; - getWebView().evaluateJavascript(code, null); + private val broadcastReceiver: BroadcastReceiver = object : BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + val token = intent.getStringExtra(KEY_TOKEN) + val code = "updateNotificationToken && updateNotificationToken('$token')" + webView.evaluateJavascript(code, null) } - }; + } - @Override - public void onStart() { - super.onStart(); - IntentFilter intentFilter = new IntentFilter(EVENT_TOKEN); - broadcastManager.registerReceiver(broadcastReceiver, intentFilter); + override fun onStart() { + super.onStart() + val intentFilter = IntentFilter(EVENT_TOKEN) + broadcastManager.registerReceiver(broadcastReceiver, intentFilter) } - @Override - public void onStop() { - super.onStop(); - broadcastManager.unregisterReceiver(broadcastReceiver); + override fun onStop() { + super.onStop() + broadcastManager.unregisterReceiver(broadcastReceiver) } - private ValueCallback<Uri> openFileCallback; - private ValueCallback<Uri[]> openFileCallback2; + private var openFileCallback: ValueCallback<Uri?>? = null + private var openFileCallback2: ValueCallback<Array<Uri>>? = null - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) { if (requestCode == REQUEST_FILE_CHOOSER) { - Uri result = data == null || resultCode != Activity.RESULT_OK ? null : data.getData(); + val result = if (resultCode != Activity.RESULT_OK) null else data.data if (openFileCallback != null) { - openFileCallback.onReceiveValue(result); - openFileCallback = null; + openFileCallback?.onReceiveValue(result) + openFileCallback = null } if (openFileCallback2 != null) { - openFileCallback2.onReceiveValue(result != null ? new Uri[] { result } : new Uri[0]); - openFileCallback2 = null; + openFileCallback2?.onReceiveValue(if (result != null) arrayOf(result) else arrayOf()) + openFileCallback2 = null } } } - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) { if (requestCode == REQUEST_PERMISSIONS_LOCATION) { - boolean granted = grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED; + val granted = grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED if (geolocationCallback != null) { - geolocationCallback.invoke(geolocationRequestOrigin, granted, false); - geolocationRequestOrigin = null; - geolocationCallback = null; + geolocationCallback?.invoke(geolocationRequestOrigin, granted, false) + geolocationRequestOrigin = null + geolocationCallback = null } } } - private String geolocationRequestOrigin; - private GeolocationPermissions.Callback geolocationCallback; - - private final WebChromeClient webChromeClient = new WebChromeClient() { - - @Override - public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) { - geolocationRequestOrigin = null; - geolocationCallback = null; - if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { - if (ActivityCompat.shouldShowRequestPermissionRationale(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION)) { - new AlertDialog.Builder(getActivity()) - .setMessage(R.string.permission_location_rationale) - .setNeutralButton(android.R.string.ok, (dialog, which) -> { - geolocationRequestOrigin = origin; - geolocationCallback = callback; - ActivityCompat.requestPermissions( - getActivity(), new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, REQUEST_PERMISSIONS_LOCATION); - }) - .show(); + private var geolocationRequestOrigin: String? = null + private var geolocationCallback: GeolocationPermissions.Callback? = null + + private val webChromeClient: WebChromeClient = object : WebChromeClient() { + + override fun onGeolocationPermissionsShowPrompt(origin: String, callback: GeolocationPermissions.Callback) { + geolocationRequestOrigin = null + geolocationCallback = null + if (ContextCompat.checkSelfPermission(activity, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) { + 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 -> + geolocationRequestOrigin = origin + geolocationCallback = callback + ActivityCompat.requestPermissions( + activity, + arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), + REQUEST_PERMISSIONS_LOCATION + ) + } + .show() } else { - geolocationRequestOrigin = origin; - geolocationCallback = callback; + geolocationRequestOrigin = origin + geolocationCallback = callback ActivityCompat.requestPermissions( - getActivity(), new String[] { Manifest.permission.ACCESS_FINE_LOCATION }, REQUEST_PERMISSIONS_LOCATION); + activity, + arrayOf(Manifest.permission.ACCESS_FINE_LOCATION), + REQUEST_PERMISSIONS_LOCATION + ) } } else { - callback.invoke(origin, true, false); + callback.invoke(origin, true, false) } } // Android 4.1+ - protected void openFileChooser(ValueCallback<Uri> uploadMessage, String acceptType, String capture) { - openFileChooser(uploadMessage); - } - - protected void openFileChooser(ValueCallback<Uri> uploadMessage) { - MainFragment.this.openFileCallback = uploadMessage; - Intent intent = new Intent(Intent.ACTION_GET_CONTENT); - intent.addCategory(Intent.CATEGORY_OPENABLE); - intent.setType("*/*"); - startActivityForResult(Intent.createChooser(intent, getString(R.string.file_browser)), REQUEST_FILE_CHOOSER); + fun openFileChooser(uploadMessage: ValueCallback<Uri?>?, acceptType: String?, capture: String?) { + openFileCallback = uploadMessage + val intent = Intent(Intent.ACTION_GET_CONTENT) + intent.addCategory(Intent.CATEGORY_OPENABLE) + intent.type = "*/*" + startActivityForResult( + Intent.createChooser(intent, getString(R.string.file_browser)), + REQUEST_FILE_CHOOSER + ) } // Android 5.0+ - public boolean onShowFileChooser(WebView mWebView, ValueCallback<Uri[]> filePathCallback, WebChromeClient.FileChooserParams fileChooserParams) { - if (openFileCallback2 != null) { - openFileCallback2.onReceiveValue(null); - openFileCallback2 = null; - } - - openFileCallback2 = filePathCallback; + override fun onShowFileChooser( + mWebView: WebView, + filePathCallback: ValueCallback<Array<Uri>>, + fileChooserParams: FileChooserParams + ): Boolean { + openFileCallback2?.onReceiveValue(null) + openFileCallback2 = filePathCallback if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - Intent intent = fileChooserParams.createIntent(); + val intent = fileChooserParams.createIntent() try { - startActivityForResult(intent, REQUEST_FILE_CHOOSER); - } catch (ActivityNotFoundException e) { - openFileCallback2 = null; - return false; + startActivityForResult(intent, REQUEST_FILE_CHOOSER) + } catch (e: ActivityNotFoundException) { + openFileCallback2 = null + return false } } - return true; + return true } + } - }; - + companion object { + const val EVENT_LOGIN = "eventLogin" + const val EVENT_TOKEN = "eventToken" + const val KEY_TOKEN = "keyToken" + private const val REQUEST_PERMISSIONS_LOCATION = 1 + private const val REQUEST_FILE_CHOOSER = 1 + } } diff --git a/app/src/main/java/org/traccar/manager/StartFragment.java b/app/src/main/java/org/traccar/manager/StartFragment.java deleted file mode 100644 index a01f644..0000000 --- a/app/src/main/java/org/traccar/manager/StartFragment.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright 2016 - 2021 Anton Tananaev (anton@traccar.org) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.manager; - -import android.annotation.SuppressLint; -import android.app.AlertDialog; -import android.app.Fragment; -import android.content.DialogInterface; -import android.net.Uri; -import android.os.AsyncTask; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.EditText; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -public class StartFragment extends Fragment implements View.OnClickListener { - - private static final String TAG = StartFragment.class.getSimpleName(); - - private static final int MAX_REDIRECTS = 5; - - private EditText serverField; - private Button startButton; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_start, container, false); - serverField = (EditText) view.findViewById(R.id.field_server); - startButton = (Button) view.findViewById(R.id.button_start); - startButton.setOnClickListener(this); - return view; - } - - @SuppressLint("StaticFieldLeak") - @Override - public void onClick(View view) { - startButton.setEnabled(false); - - new AsyncTask<String, Void, Boolean>() { - - @Override - protected Boolean doInBackground(String... urls) { - try { - - Uri uri = Uri.parse(urls[0]).buildUpon().appendEncodedPath("api/server").build(); - String url = uri.toString(); - HttpURLConnection urlConnection = null; - - for (int i = 0; i < MAX_REDIRECTS; i++) { - URL resourceUrl = new URL(url); - urlConnection = (HttpURLConnection) resourceUrl.openConnection(); - urlConnection.setInstanceFollowRedirects(false); - - switch (urlConnection.getResponseCode()) { - case HttpURLConnection.HTTP_MOVED_PERM: - case HttpURLConnection.HTTP_MOVED_TEMP: - url = urlConnection.getHeaderField("Location"); - continue; - } - - break; - } - - BufferedReader reader = new BufferedReader(new InputStreamReader(urlConnection.getInputStream())); - - String line; - StringBuilder responseBuilder = new StringBuilder(); - while ((line = reader.readLine()) != null) { - responseBuilder.append(line); - } - - new JSONObject(responseBuilder.toString()); - - return true; - - } catch (IOException | JSONException e) { - Log.w(TAG, e); - } - return false; - } - - @Override - protected void onPostExecute(Boolean result) { - if (getActivity() != null) { - if (result) { - onSuccess(); - } else { - onError(); - } - } - } - - }.execute(serverField.getText().toString()); - } - - private void onSuccess() { - PreferenceManager.getDefaultSharedPreferences(getActivity()) - .edit().putString(MainActivity.PREFERENCE_URL, serverField.getText().toString()).apply(); - getActivity().getFragmentManager() - .beginTransaction().replace(android.R.id.content, new MainFragment()).commitAllowingStateLoss(); - } - - private void onError() { - startButton.setEnabled(true); - - AlertDialog alertDialog = new AlertDialog.Builder(getActivity()).create(); - alertDialog.setMessage(getString(R.string.error_connection)); - alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(android.R.string.ok), - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - dialog.dismiss(); - } - }); - alertDialog.show(); - } - -} diff --git a/app/src/main/java/org/traccar/manager/StartFragment.kt b/app/src/main/java/org/traccar/manager/StartFragment.kt new file mode 100644 index 0000000..ee379a2 --- /dev/null +++ b/app/src/main/java/org/traccar/manager/StartFragment.kt @@ -0,0 +1,123 @@ +/* + * Copyright 2016 - 2021 Anton Tananaev (anton@traccar.org) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +@file:Suppress("DEPRECATION") +package org.traccar.manager + +import android.annotation.SuppressLint +import android.app.AlertDialog +import android.app.Fragment +import android.net.Uri +import android.os.AsyncTask +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Button +import android.widget.EditText +import androidx.preference.PreferenceManager +import org.json.JSONException +import org.json.JSONObject +import org.traccar.manager.StartFragment +import java.io.BufferedReader +import java.io.IOException +import java.io.InputStreamReader +import java.net.HttpURLConnection +import java.net.URL + +class StartFragment : Fragment(), View.OnClickListener { + + private lateinit var serverField: EditText + private lateinit var startButton: Button + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + val view = inflater.inflate(R.layout.fragment_start, container, false) + serverField = view.findViewById(R.id.field_server) + startButton = view.findViewById(R.id.button_start) + startButton.setOnClickListener(this) + return view + } + + @SuppressLint("StaticFieldLeak") + override fun onClick(view: View) { + startButton.isEnabled = false + object : AsyncTask<String, Unit, Boolean>() { + override fun doInBackground(vararg urls: String): Boolean { + try { + val uri = Uri.parse(urls[0]).buildUpon().appendEncodedPath("api/server").build() + var url = uri.toString() + var urlConnection: HttpURLConnection? = null + for (i in 0 until MAX_REDIRECTS) { + val resourceUrl = URL(url) + urlConnection = resourceUrl.openConnection() as HttpURLConnection + urlConnection.instanceFollowRedirects = false + when (urlConnection.responseCode) { + HttpURLConnection.HTTP_MOVED_PERM, HttpURLConnection.HTTP_MOVED_TEMP -> { + url = urlConnection.getHeaderField("Location") + continue + } + } + break + } + val reader = BufferedReader(InputStreamReader(urlConnection?.inputStream)) + var line: String? + val responseBuilder = StringBuilder() + while (reader.readLine().also { line = it } != null) { + responseBuilder.append(line) + } + JSONObject(responseBuilder.toString()) + return true + } catch (e: IOException) { + Log.w(TAG, e) + } catch (e: JSONException) { + Log.w(TAG, e) + } + return false + } + + override fun onPostExecute(result: Boolean) { + if (activity != null) { + if (result) { + onSuccess() + } else { + onError() + } + } + } + }.execute(serverField.text.toString()) + } + + private fun onSuccess() { + PreferenceManager.getDefaultSharedPreferences(activity) + .edit().putString(MainActivity.PREFERENCE_URL, serverField.text.toString()).apply() + activity.fragmentManager + .beginTransaction().replace(android.R.id.content, MainFragment()) + .commitAllowingStateLoss() + } + + private fun onError() { + startButton.isEnabled = true + val alertDialog = AlertDialog.Builder(activity).create() + alertDialog.setMessage(getString(R.string.error_connection)) + alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, getString(android.R.string.ok)) { dialog, _ -> dialog.dismiss() } + alertDialog.show() + } + + companion object { + private val TAG = StartFragment::class.java.simpleName + private const val MAX_REDIRECTS = 5 + } +} |