Beta 3 pre-release

Author: Troplo

.idea/gradle.xml

@@ -13,8 +13,8 @@ android {
         applicationId = "com.troplo.privateuploader"
         minSdk = 28
         targetSdk = 34
-        versionCode = 2
-        versionName = "1.0.2"
+        versionCode = 3
+        versionName = "1.0.3"
         multiDexEnabled = true
         buildConfigField("String", "SERVER_URL", "\"https://privateuploader.com\"")
         buildConfigField("String", "BUILD_TIME", "\"${System.currentTimeMillis()}\"")
@@ -63,7 +63,6 @@ android {
 
 dependencies {
     // TPU
-
     implementation("io.noties.markwon:core:4.6.2")
     implementation("io.noties.markwon:ext-strikethrough:4.6.2")
     implementation("io.noties.markwon:ext-tables:4.6.2")

.idea/migrations.xml

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 2,
-      "versionName": "1.0.2",
+      "versionCode": 3,
+      "versionName": "1.0.3",
       "outputFile": "app-release.apk"
     }
   ],

app/build.gradle.kts

@@ -26,6 +26,7 @@ import coil.request.ImageRequest
 import coil.size.Size
 import com.troplo.privateuploader.api.SessionManager
 import com.troplo.privateuploader.api.SocketHandler
+import com.troplo.privateuploader.api.SocketHandlerService
 import com.troplo.privateuploader.api.TpuFunctions
 import com.troplo.privateuploader.api.imageLoader
 import com.troplo.privateuploader.api.stores.UserStore
@@ -39,7 +40,7 @@ import java.net.URISyntaxException
 
 
 class ChatService : Service() {
-    private var socket: Socket? = SocketHandler.getSocket()
+    private var socket: Socket? = SocketHandlerService.getSocket()
     private val messages = mutableMapOf<Int, MutableList<NotificationCompat.MessagingStyle.Message>>()
 
     override fun onCreate() {
@@ -49,8 +50,8 @@ class ChatService : Service() {
             if(socket == null || !socket!!.connected()) {
                 val token = SessionManager(this).getAuthToken()
                 if(!token.isNullOrBlank()) {
-                    SocketHandler.initializeSocket(token, this, "android_kotlin_background_service")
-                    socket = SocketHandler.getSocket()
+                    SocketHandlerService.initializeSocket(token, this, "android_kotlin_background_service")
+                    socket = SocketHandlerService.getSocket()
                 }
             }
         } catch (e: URISyntaxException) {
@@ -75,6 +76,7 @@ class ChatService : Service() {
     private val onNewMessage: Emitter.Listener = object : Emitter.Listener {
         override fun call(vararg args: Any?) {
             println("[ChatService] Message received")
+
             // Process the new message
             val jsonArray = args[0] as JSONObject
             val payload = jsonArray.toString()

app/release/app-release.apk

@@ -4,15 +4,28 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.ui.platform.LocalContext
 import com.troplo.privateuploader.api.SessionManager
 import com.troplo.privateuploader.api.SocketHandler
 import com.troplo.privateuploader.api.TpuApi
 import com.troplo.privateuploader.api.stores.UserStore
-import com.troplo.privateuploader.data.model.User
 import com.troplo.privateuploader.ui.theme.PrivateUploaderTheme
 
 class MainActivity : ComponentActivity() {
+
+    override fun onStart() {
+        super.onStart()
+        stopService(Intent(this, ChatService::class.java))
+        val socket = SocketHandler.getSocket()
+        if (socket != null && !socket.connected()) {
+            socket.connect()
+        }
+    }
+
+    override fun onStop() {
+        super.onStop()
+        startService(Intent(this, ChatService::class.java))
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         // if(BuildConfig.DEBUG) StrictMode.enableDefaults();
         val token = SessionManager(this).getAuthToken()
@@ -36,7 +49,6 @@ class MainActivity : ComponentActivity() {
             }
         }
         super.onCreate(savedInstanceState)
-        startService(Intent(this, ChatService::class.java))
         /*
                 fun requestPermissions() {
                     val permissions = arrayOf(

app/release/output-metadata.json

@@ -62,7 +62,7 @@ fun MainScreen() {
         }
         Scaffold(
             topBar = {
-                if (!SocketHandler.connected.value) {
+                if (!SocketHandler.connected.value && user.value != null) {
                     ConnectingBanner()
                 } else {
                     TopBarNav(
@@ -99,7 +99,8 @@ fun MainScreen() {
                                     navController.navigate("${NavRoute.Chat.path}/$chatId")
                                     closePanels = true
                                 },
-                                panelState = panelState
+                                panelState = panelState,
+                                navController = navController
                             )
                         }
                     }

app/src/main/java/com/troplo/privateuploader/ChatService.kt

@@ -6,6 +6,7 @@ import android.os.Looper
 import android.widget.Toast
 import com.troplo.privateuploader.BuildConfig
 import com.troplo.privateuploader.data.model.Chat
+import com.troplo.privateuploader.data.model.ChatCreateRequest
 import com.troplo.privateuploader.data.model.EditRequest
 import com.troplo.privateuploader.data.model.Friend
 import com.troplo.privateuploader.data.model.Gallery
@@ -202,6 +203,11 @@ object TpuApi {
             @Query("query") query: String = "",
             @Query("page") page: Int = 1
         ): Call<MessageSearchResponse>
+
+        @POST("chats")
+        fun createChat(
+            @Body members: ChatCreateRequest
+        ): Call<Chat>
     }
 
     val retrofitService: TpuApiService by lazy {

app/src/main/java/com/troplo/privateuploader/MainActivity.kt

@@ -4,6 +4,7 @@ import com.troplo.privateuploader.data.model.Chat
 import com.troplo.privateuploader.data.model.User
 import java.text.DateFormat
 import java.text.SimpleDateFormat
+import java.time.Instant
 import java.time.LocalDate
 import java.time.ZoneId
 import java.time.ZoneOffset