Merge pull request #1 from krlan2789/main

Android 14 device support . .

Author: stefanusayudha

app/build.gradle

@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'com.singularity_code.gpstracker'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.singularity_code.gpstracker"
         minSdk 24
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 

gradle.properties

@@ -22,7 +22,7 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.experimental.cacheCompileLibResources=true
-android.enableJetifier          =true
-org.gradle.caching              =true
-kotlin.incremental              =true
-org.gradle.parallel             =true
+android.enableJetifier=true
+org.gradle.caching=true
+kotlin.incremental=true
+org.gradle.parallel=true

live-location/build.gradle

@@ -5,11 +5,11 @@ plugins {
 
 android {
     namespace 'com.singularity_code.live_location'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 24
-        targetSdk 33
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -67,5 +67,4 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
-
 }

live-location/src/main/AndroidManifest.xml

@@ -2,9 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" android:minSdkVersion="29" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application android:usesCleartextTraffic="true">

live-location/src/main/java/com/singularity_code/live_location/LiveLocationService.kt

@@ -8,6 +8,7 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.pm.ServiceInfo
 import android.graphics.Color
 import android.net.Uri
 import android.os.Binder
@@ -85,11 +86,15 @@ class LiveLocationService : Service() {
     private val liveLocationError = MutableStateFlow<ErrorMessage?>(null)
     private val currentLocation = MutableStateFlow<LocationData?>(null)
     private val liveLocationRunning = MutableStateFlow(false)
-    private val locationRequest: LocationRequest by lazy {
-        LocationRequest.create()
-            .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
-            .setInterval(gpsSamplingRate)
-            .setFastestInterval(gpsSamplingRate)
+//    private val locationRequest: LocationRequest by lazy {
+//        LocationRequest.create()
+//            .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
+//            .setInterval(gpsSamplingRate)
+//            .setFastestInterval(gpsSamplingRate)
+//    }
+
+    private  val locationRequest: LocationRequest by lazy {
+        LocationRequest.Builder(Priority.PRIORITY_HIGH_ACCURACY, gpsSamplingRate).build()
     }
 
     private val locationProviderClient: FusedLocationProviderClient by lazy {
@@ -259,10 +264,20 @@ class LiveLocationService : Service() {
                     }
                     .build()
 
-                startForeground(
-                    foregroundServiceID ?: 1005,
-                    notification
-                )
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    startForeground(
+                        foregroundServiceID ?: 1005,
+                        notification,
+                        ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION
+                    )
+                } else {
+                    startForeground(
+                        foregroundServiceID ?: 1005,
+                        notification
+                    )
+                }
+
             }
 
             /** prepare websocket connection **/

live-location/src/main/java/com/singularity_code/live_location/data/Repository.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import arrow.core.Either
 import com.singularity_code.live_location.util.ErrorMessage
 import com.singularity_code.live_location.util.defaultOkhttp
+import com.singularity_code.live_location.util.isConnected
 import com.singularity_code.live_location.util.websocket
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -39,6 +40,7 @@ class WebSocketRepository(
     private lateinit var webSocket: WebSocket
 
     private var socketPendingJob: Job? = null
+//    private var isConnected: Boolean = false
 
     override fun openConnection() {
         socketPendingJob?.cancel()
@@ -60,6 +62,8 @@ class WebSocketRepository(
 
     override suspend fun sendData(data: String): Either<ErrorMessage, String> {
         return kotlin.runCatching {
+            if (!webSocket.isConnected) openConnection()
+
             val result = webSocket.send(data)
             Either.Right(result.toString())
         }.getOrElse {

live-location/src/main/java/com/singularity_code/live_location/util/WebSocker.kt

@@ -10,6 +10,13 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import okhttp3.*
 
+var _isConnected: Boolean = false
+var WebSocket.isConnected: Boolean
+    get() = _isConnected
+    set(value) {
+        _isConnected = value
+    }
+
 fun websocket(
     context: Context,
     apiURL: String,
@@ -36,13 +43,15 @@ fun websocket(
 
     val listener = object : WebSocketListener() {
         override fun onOpen(webSocket: WebSocket, response: Response) {
-            Log.d("TAG", "WebSocket: Opened")
+            Log.d("WSS_TAG", "WebSocket: Opened ${response.message}")
+            webSocket.isConnected = true
             super.onOpen(webSocket, response)
         }
 
         override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
             super.onFailure(webSocket, t, response)
-            Log.d("TAG", "WebSocket: Failed $t")
+            Log.d("WSS_TAG", "WebSocket: Failed ${t.message} | ${t.stackTraceToString()} | ${response?.message} | ${response?.body}")
+            webSocket.isConnected = false
 
             // IMPORTANT trigger recreate socket
             val errorLog = hashMapOf(
@@ -56,12 +65,13 @@ fun websocket(
         }
 
         override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
-            Log.d("TAG", "WebSocket: Closed")
+            Log.d("WSS_TAG", "WebSocket: Closed")
+            webSocket.isConnected = false
             super.onClosed(webSocket, code, reason)
         }
 
         override fun onMessage(webSocket: WebSocket, text: String) {
-            Log.d("TAG", "WebSocket: Message $text")
+            Log.d("WSS_TAG", "WebSocket: Message: $text")
             super.onMessage(webSocket, text)
         }
     }

live-location/src/main/java/com/singularity_code/live_location/util/other/AlienPortal.java

@@ -1,13 +1,18 @@
 package com.singularity_code.live_location.util.other;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
+import android.util.Log;
+
+import androidx.core.app.ActivityCompat;
 import androidx.core.app.NotificationCompat;
 import com.google.android.gms.location.LocationResult;
 import com.singularity_code.live_location.util.enums.NetworkMethod;
 import com.singularity_code.live_location.util.pattern.*;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
 import java.util.HashMap;
 
 public class AlienPortal {
@@ -82,6 +87,11 @@ public String getUpdatedTime() {
 
     private LiveLocationServiceInteractor liveLocationServiceInteractor;
 
+    public void requestPermissions(String[] permissions) {
+        Log.d("AlienPortal", "requestPermissions: " + Arrays.toString(permissions));
+        ActivityCompat.requestPermissions((Activity) context.getApplicationContext(), permissions, 201);
+    }
+
     public void setGPSSamplingRate(long samplingRate) {
         gpsSamplingRate = samplingRate;
     }

settings.gradle

@@ -13,6 +13,6 @@ dependencyResolutionManagement {
         maven { url 'https://jitpack.io' }
     }
 }
-rootProject.name = "GPS Tracker"
+rootProject.name = "Android Background Location"
 include ':app'
 include ':live-location'