yayan 1 year ago
parent
commit
117cf95889

+ 2 - 2
app/build.gradle.kts

@@ -2,9 +2,9 @@ plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsKotlinAndroid)
     alias(libs.plugins.googleDaggerHiltAndroid)
-    alias(libs.plugins.googleDevtoolsKsp)
     alias(libs.plugins.jetbrainsKotlinPluginSerialization)
     id("kotlin-parcelize")
+    alias(libs.plugins.googleDevtoolsKsp)
 }
 
 android {
@@ -57,7 +57,7 @@ android {
         buildConfig = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.3"
+        kotlinCompilerExtensionVersion = "1.5.13"
     }
     packaging {
         resources {

+ 1 - 1
app/src/main/java/io/nexilis/alpha/ui/components/Person.kt

@@ -33,7 +33,7 @@ fun Person(buddy: Buddy) {
         ) {
             AsyncImage(
                 model = ImageRequest.Builder(LocalContext.current)
-                    .data("https://digixplatform.com/filepalio/image/${buddy.image_id}")
+                    .data("https://202.158.33.27/filepalio/image/${buddy.image_id}")
                     .addHeader("Cookie", "PHPSESSID=123;MOBILE=123")
                     .crossfade(true)
                     .build(),

+ 1 - 1
app/src/main/java/io/nexilis/alpha/ui/main/Contact.kt

@@ -129,7 +129,7 @@ fun GroupContact(navController: NavHostController) {
                     leadingContent = {
                         AsyncImage(
                             model = ImageRequest.Builder(LocalContext.current)
-                                .data("https://digixplatform.com/filepalio/image/${it.image_id}")
+                                .data("https://202.158.33.27/filepalio/image/${it.image_id}")
                                 .addHeader("Cookie", "PHPSESSID=123;MOBILE=123")
                                 .crossfade(true)
                                 .build(),

+ 1 - 1
app/src/main/java/io/nexilis/alpha/ui/main/Home.kt

@@ -48,7 +48,7 @@ fun Home(
                 .fillMaxWidth()
             AsyncImage(
                 model = ImageRequest.Builder(LocalContext.current)
-                    .data("https://digixplatform.com/filepalio/image/${buddy?.image_id}")
+                    .data("https://202.158.33.27/filepalio/image/${buddy?.image_id}")
                     .addHeader("Cookie", "PHPSESSID=123;MOBILE=123")
                     .crossfade(true)
                     .build(),

+ 1 - 1
app/src/main/java/io/nexilis/alpha/ui/main/Profile.kt

@@ -92,7 +92,7 @@ fun Profile(contentPadding: PaddingValues = PaddingValues(0.dp), me: Buddy) {
                     rememberAsyncImagePainter(imageUri)
                 else rememberAsyncImagePainter(
                     model = ImageRequest.Builder(LocalContext.current)
-                        .data("https://digixplatform.com/filepalio/image/${me.image_id}")
+                        .data("https://202.158.33.27/filepalio/image/${me.image_id}")
                         .addHeader("Cookie", "PHPSESSID=123;MOBILE=123")
                         .crossfade(true)
                         .build(),

+ 1 - 1
cpaas-lite/build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsKotlinAndroid)
-    alias(libs.plugins.googleDevtoolsKsp)
     alias(libs.plugins.googleDaggerHiltAndroid)
     alias(libs.plugins.googleGmsGoogleServices)
+    alias(libs.plugins.googleDevtoolsKsp)
 }
 
 android {

+ 3 - 3
cpaas-lite/src/main/java/io/nexilis/service/Api.kt

@@ -47,12 +47,12 @@ class Api {
                         activity,
                         SdkCallback::class.java,
                         SdkCallback(),
-                        "108.136.37.34",
-                        42823,
+                        "202.158.33.26",
+                        62823,
                         session,
                         "09:00",
                         false,
-                        "108.136.37.34:42823"
+                        "202.158.33.26:62823"
                     )
                     val pin = preferences.optString(key = "pin", default = "")
                     if (pin.isEmpty()) {

+ 2 - 2
cpaas-lite/src/main/java/io/nexilis/service/FirebaseService.kt

@@ -34,7 +34,7 @@ class FirebaseService : FirebaseMessagingService() {
 
     private fun pullMessage(messageId: String, me: String) {
         Network().post(
-            "https://digixplatform.com/pull_notification",
+            "https://202.158.33.27/pull_notification",
             "message_id=$messageId&pin=$me"
         ) { r, body ->
             if (r && !body.isNullOrEmpty()) {
@@ -45,7 +45,7 @@ class FirebaseService : FirebaseMessagingService() {
                         Incoming(applicationContext).process(d) {
                             if (it) {
                                 Network().post(
-                                    "https://digixplatform.com/ack_message",
+                                    "https://202.158.33.27/ack_message",
                                     "message_id=$messageId&pin=$me"
                                 ) { _, _ ->
                                 }

+ 2 - 2
cpaas-lite/src/main/java/io/nexilis/service/core/Incoming.kt

@@ -392,7 +392,7 @@ class Incoming(private val context: Context) {
             imageId?.let { fileName ->
                 uri = Network().download(
                     context,
-                    "https://digixplatform.com/filepalio/image/$fileName"
+                    "https://202.158.33.27/filepalio/image/$fileName"
                 )
             }
             ApiRoomDatabase.getDatabase(context).messageDao().insert(
@@ -499,7 +499,7 @@ class Incoming(private val context: Context) {
                 val request = ImageRequest.Builder(context)
                     .addHeader("User-Agent", "Mozilla/5.0")
                     .addHeader("Cookie", "PHPSESSID=123;MOBILE=123")
-                    .data("https://digixplatform.com/filepalio/image/${buddy.image_id}")
+                    .data("https://202.158.33.27/filepalio/image/${buddy.image_id}")
                     .transformations(CircleCropTransformation())
                     .build()
                 val drawable = context.getUnsafeImageLoader().execute(request).drawable as BitmapDrawable

+ 1 - 1
cpaas-lite/src/main/java/io/nexilis/service/core/Outgoing.kt

@@ -92,7 +92,7 @@ class Outgoing(private val context: Context, parameters: WorkerParameters) :
                     if (fileName.isNotEmpty()) {
                         val file = File(context.filesDir, fileName)
                         val upload = Network().uploadSync(
-                            "https://digixplatform.com/uploader",
+                            "https://202.158.33.27/uploader",
                             file
                         ) { progress, length ->
                             setProgressAsync(

+ 12 - 1
cpaas-lite/src/main/java/io/nexilis/service/data/repositories/BuddyRepository.kt

@@ -3,6 +3,9 @@ package io.nexilis.service.data.repositories
 import android.content.Context
 import android.util.Log
 import androidx.lifecycle.LiveData
+import com.google.android.gms.tasks.OnCompleteListener
+import com.google.firebase.messaging.FirebaseMessaging
+import io.nexilis.service.Api
 import io.nexilis.service.Service
 import io.nexilis.service.core.Data
 import io.nexilis.service.core.Network
@@ -95,6 +98,14 @@ class BuddyRepository @Inject constructor(private val dao: BuddyDao) : Repositor
                 context.getSharedPreferences().put(key = "pin", value = pin)
                 context.getSharedPreferences().put(key = "is_login", value = true)
             }
+            FirebaseMessaging.getInstance().token.addOnCompleteListener(OnCompleteListener { task ->
+                if (!task.isSuccessful) {
+                    Log.w(tag, "Fetching FCM registration token failed", task.exception)
+                    return@OnCompleteListener
+                }
+                val token = task.result
+                Api.sendToken(context, token)
+            })
             withContext(Dispatchers.Main) {
                 completion(data.isOk(), pin)
             }
@@ -148,7 +159,7 @@ class BuddyRepository @Inject constructor(private val dao: BuddyDao) : Repositor
     }
 
     fun changeProfile(me: String, file: File, completion: (Boolean) -> Unit) {
-        Network().upload("https://digixplatform.com/uploader", file) {
+        Network().upload("https://202.158.33.27/uploader", file) {
             if (it) {
                 Service.sendAsync(
                     Data(

+ 1 - 1
cpaas-lite/src/main/java/io/nexilis/service/data/viewmodels/ProgressViewModel.kt

@@ -25,7 +25,7 @@ class ProgressViewModel @Inject constructor(private val repository: ProgressRepo
     fun download(context: Context, message: Message) = apiScope.launch(Dispatchers.IO) {
         Network().download(
             context,
-            "https://digixplatform.com/filepalio/image/${message.file_id}"
+            "https://202.158.33.27/filepalio/image/${message.file_id}"
         ) { value, length ->
             viewModelScope.launch(Dispatchers.IO) {
                 repository.upsert(Progress(message.message_id, value.toFloat() / length.toFloat()))

+ 5 - 5
gradle/libs.versions.toml

@@ -1,13 +1,13 @@
 [versions]
-agp = "8.3.1"
-kotlin = "1.9.10"
-ksp = "1.9.10-1.0.13"
-coreKtx = "1.12.0"
+agp = "8.4.0"
+kotlin = "1.9.23"
+ksp = "1.9.23-1.0.20"
+coreKtx = "1.13.1"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"
 lifecycleRuntimeKtx = "2.7.0"
-activityCompose = "1.8.2"
+activityCompose = "1.9.0"
 composeBom = "2024.05.00"
 hilt = "2.49"
 hiltNavigation = "1.2.0"

+ 1 - 1
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Nov 24 10:36:14 ICT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME