gohj99 · gohj99 · Mar 9, 2025 · Mar 9, 2025
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.compose.compiler)
-    id("com.google.gms.google-services")
 }
 
 android {
@@ -22,8 +21,8 @@ android {
         minSdk = 26
         //noinspection OldTargetApi
         targetSdk = 34
-        versionCode = 26
-        versionName = "1.3.5"
+        versionCode = 25
+        versionName = "1.3.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -121,9 +120,6 @@ dependencies {
     implementation(project(":libtd"))
     implementation(libs.lottie)
     implementation(libs.lottie.compose)
-    // Import the Firebase BoM
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.messaging)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(platform(libs.androidx.compose.bom))

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -157,14 +157,6 @@
                 android:resource="@xml/file_paths" />
         </provider>
 
-        <service
-            android:name=".TdFirebaseMessagingService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
-            </intent-filter>
-        </service>
-
     </application>
 
     <queries>

diff --git a/app/src/main/java/com/gohj99/telewatch/AddProxyActivity.kt b/app/src/main/java/com/gohj99/telewatch/AddProxyActivity.kt
@@ -9,9 +9,6 @@
 package com.gohj99.telewatch
 
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
@@ -101,10 +98,6 @@ class AddProxyActivity : ComponentActivity() {
                 SplashAddProxyScreen(
                     add = { server, port, type ->
                         tgApi?.addProxy(server, port, type)
-                        Handler(Looper.getMainLooper()).post {
-                            Toast.makeText(this, getString(R.string.Successful), Toast.LENGTH_SHORT).show()
-                        }
-                        finish()
                     },
                     parseServer = parseServer,
                     parsePort = parsePort,
@@ -147,7 +140,7 @@ fun SplashAddProxyScreen(add: (String, Int, TdApi.ProxyType) -> Unit, parseServe
                     verticalAlignment = Alignment.CenterVertically // 垂直方向居中对齐
                 ) {
                     Text(
-                        text = stringResource(id = R.string.Add_Proxy),
+                        text = stringResource(id = R.string.Proxy),
                         color = Color.White,
                         fontWeight = FontWeight.Bold,
                         fontSize = 18.sp

diff --git a/app/src/main/java/com/gohj99/telewatch/AllowDataCollectionActivity.kt b/app/src/main/java/com/gohj99/telewatch/AllowDataCollectionActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Copyright (c) 2024 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
  * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
  * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
@@ -179,6 +179,6 @@ fun SplashAllowDataCollectionScreen(set: (Boolean) -> Unit) {
 @Composable
 fun SplashAllowDataCollectionScreenPreview() {
     TelewatchTheme {
-        SplashAllowDataCollectionScreen { }
+        SplashAllowDataCollectionScreen { /*TODO*/ }
     }
 }
diff --git a/app/src/main/java/com/gohj99/telewatch/ChatActivity.kt b/app/src/main/java/com/gohj99/telewatch/ChatActivity.kt
@@ -63,7 +63,11 @@ class ChatActivity : ComponentActivity() {
 
     override fun onDestroy() {
         super.onDestroy()
-        TgApiManager.tgApi?.exitChatPage()
+        runBlocking {
+            lifecycleScope.launch {
+                TgApiManager.tgApi?.exitChatPage()
+            }.join() // 等待协程执行完毕
+        }
     }
 
     override fun onResume() {
@@ -142,11 +146,7 @@ class ChatActivity : ComponentActivity() {
 
         // 异步获取当前用户 ID 和聊天记录
         lifecycleScope.launch {
-            while (currentUserId.value == -1L) {
-                tgApi!!.getCurrentUser() ?.let {
-                    currentUserId.value = it[0].toLong()
-                }
-            }
+            currentUserId.value = tgApi!!.getCurrentUser()[0].toLong()
             tgApi!!.fetchMessages(0, chat!!.id)
         }
 

diff --git a/app/src/main/java/com/gohj99/telewatch/ChatInfoActivity.kt b/app/src/main/java/com/gohj99/telewatch/ChatInfoActivity.kt
@@ -20,7 +20,6 @@ import com.gohj99.telewatch.ui.SplashChatInfoScreen
 import com.gohj99.telewatch.ui.main.ErrorScreen
 import com.gohj99.telewatch.ui.main.SplashLoadingScreen
 import com.gohj99.telewatch.ui.theme.TelewatchTheme
-import com.gohj99.telewatch.utils.formatTimestampToDate
 import com.gohj99.telewatch.utils.telegram.TgApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -93,41 +92,26 @@ class ChatInfoActivity : ComponentActivity() {
                     val userInfo = runBlocking {
                         tgApi!!.getUser(chatType.userId)
                     }
-                    val userFullInfo = runBlocking {
-                        tgApi!!.getUserFullInfo(chatType.userId)
-                    }
                     if (userInfo != null) {
-                        if (userInfo.type is TdApi.UserTypeBot) {
-                            subtitle = getString(R.string.Bot)
-                        } else {
-                            when(val status = userInfo.status) {
-                                is TdApi.UserStatusOnline ->
-                                    subtitle = getString(R.string.Online)
-                                is TdApi.UserStatusEmpty ->
-                                    subtitle = getString(R.string.Unknown)
-                                is TdApi.UserStatusRecently ->
-                                    subtitle = getString(R.string.Lately)
-                                is TdApi.UserStatusLastWeek ->
-                                    subtitle = getString(R.string.Last_week)
-                                is TdApi.UserStatusLastMonth ->
-                                    subtitle = getString(R.string.Last_month)
-                                is TdApi.UserStatusOffline ->
-                                    if (status.wasOnline > 0) {
-                                        subtitle = "${getString(R.string.last_seen)} ${formatTimestampToDate(status.wasOnline)}"
-                                    } else {
-                                        subtitle = getString(R.string.Offline)
-                                    }
-                            }
-                            if (userInfo.phoneNumber != "") {
-                                info += "\n**${getString(R.string.phoneNumber)}**\n+${userInfo.phoneNumber}"
-                            }
-                            if (userInfo.usernames != null) {
-                                info += "\n**${getString(R.string.username)}**\n@${userInfo.usernames!!.activeUsernames[0]}"
-                            }
-                            val bio = userFullInfo?.bio?.text?: ""
-                            if (bio.isNotEmpty() == true) {
-                                info += "\n**${getString(R.string.Bio)}**\n${bio}"
-                            }
+                        when(userInfo.status) {
+                            is TdApi.UserStatusOnline ->
+                                subtitle = getString(R.string.Online)
+                            is TdApi.UserStatusEmpty ->
+                                subtitle = getString(R.string.Unknown)
+                            is TdApi.UserStatusRecently ->
+                                subtitle = getString(R.string.Lately)
+                            is TdApi.UserStatusLastWeek ->
+                                subtitle = getString(R.string.Last_week)
+                            is TdApi.UserStatusLastMonth ->
+                                subtitle = getString(R.string.Last_month)
+                            is TdApi.UserStatusOffline ->
+                                subtitle = getString(R.string.Offline)
+                        }
+                        if (userInfo.phoneNumber != "") {
+                            info += "\n**${getString(R.string.phoneNumber)}**\n+${userInfo.phoneNumber}"
+                        }
+                        if (userInfo.usernames != null) {
+                            info += "\n**${getString(R.string.username)}**\n@${userInfo.usernames!!.activeUsernames[0]}"
                         }
                     }
                 }
@@ -161,7 +145,7 @@ class ChatInfoActivity : ComponentActivity() {
 
                 // 超级群组
                 is TdApi.ChatTypeSupergroup -> {
-                    //println("超级群组")
+                    println("超级群组")
                     subtitle = getString(R.string.Supergroup_Chat)
                     val supergroupInfo = runBlocking {
                         tgApi!!.getSupergroup(chatType.supergroupId)
@@ -199,37 +183,23 @@ class ChatInfoActivity : ComponentActivity() {
                 }
 
             }
-            if (chatType is TdApi.ChatTypePrivate) {
-                runOnUiThread {
-                    setContent {
-                        TelewatchTheme {
-                            SplashChatInfoScreen(
-                                chatObject = chatObject!!,
-                                subtitle = subtitle,
-                                info = info,
-                                deleteChat = {
-                                    lifecycleScope.launch(Dispatchers.IO) {
-                                        tgApi!!.deleteChat(safeChat.id)
-                                        finish()
-                                    }
+            runOnUiThread {
+                setContent {
+                    TelewatchTheme {
+                        SplashChatInfoScreen(
+                            chatObject = chatObject!!,
+                            subtitle = subtitle,
+                            info = info,
+                            deleteChat = {
+                                lifecycleScope.launch(Dispatchers.IO) {
+                                    tgApi!!.deleteChat(safeChat.id)
+                                    finish()
                                 }
-                            )
-                        }
-                    }
-                }
-            } else {
-                runOnUiThread {
-                    setContent {
-                        TelewatchTheme {
-                            SplashChatInfoScreen(
-                                chatObject = chatObject!!,
-                                subtitle = subtitle,
-                                info = info
-                            )
-                        }
+                            }
+                        )
                     }
                 }
             }
-        }
+            }
     }
 }
diff --git a/app/src/main/java/com/gohj99/telewatch/ConfirmLogoutActivity.kt b/app/src/main/java/com/gohj99/telewatch/ConfirmLogoutActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Copyright (c) 2024 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
  * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
  * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
@@ -208,6 +208,6 @@ fun SplashConfirmLogoutActivityScreen(set: (Boolean) -> Unit) {
 @Composable
 fun SplashConfirmLogoutActivityScreenPreview() {
     TelewatchTheme {
-        SplashConfirmLogoutActivityScreen { }
+        SplashConfirmLogoutActivityScreen { /*TODO*/ }
     }
 }
diff --git a/app/src/main/java/com/gohj99/telewatch/GoToAnnouncementActivity.kt b/app/src/main/java/com/gohj99/telewatch/GoToAnnouncementActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Copyright (c) 2024 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
  * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
  * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
@@ -157,6 +157,6 @@ fun SplashAnnouncementActivityScreen(set: (Boolean) -> Unit) {
 @Composable
 fun SplashGoToAnnouncementActivityPreview() {
     TelewatchTheme {
-        SplashAnnouncementActivityScreen { }
+        SplashAnnouncementActivityScreen { /*TODO*/ }
     }
 }
diff --git a/app/src/main/java/com/gohj99/telewatch/GoToCheckUpdateActivity.kt b/app/src/main/java/com/gohj99/telewatch/GoToCheckUpdateActivity.kt
@@ -156,6 +156,6 @@ fun SplashGoToCheckUpdateScreen(set: (Boolean) -> Unit) {
 @Composable
 fun SplashGoToCheckUpdateScreenPreview() {
     TelewatchTheme {
-            SplashAllowDataCollectionScreen { }
+        SplashAllowDataCollectionScreen { /*TODO*/ }
     }
 }
diff --git a/app/src/main/java/com/gohj99/telewatch/ImgViewActivity.kt b/app/src/main/java/com/gohj99/telewatch/ImgViewActivity.kt
@@ -24,7 +24,6 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -49,8 +48,6 @@ import androidx.media3.common.Player
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.PlayerView
 import coil.compose.rememberAsyncImagePainter
-import coil.request.ImageRequest
-import coil.size.Size
 import com.airbnb.lottie.compose.LottieAnimation
 import com.airbnb.lottie.compose.LottieCompositionSpec
 import com.airbnb.lottie.compose.LottieConstants
@@ -363,18 +360,13 @@ fun saveImageToExternalStorage(context: Context, photoPath: String): String {
 private fun SplashImgView(photoPath: String, saveImage: () -> Unit) {
     Box(
         modifier = Modifier
-            .padding(20.dp)
+            .padding(16.dp)
             .fillMaxSize()
-            .aspectRatio(1f),
+            .fillMaxWidth(),
         contentAlignment = Alignment.Center
     ) {
         Image(
-            painter = rememberAsyncImagePainter(
-                model = ImageRequest.Builder(LocalContext.current)
-                    .data(photoPath)
-                    .size(Size.ORIGINAL) // 确保使用原始尺寸
-                    .build()
-            ),
+            painter = rememberAsyncImagePainter(model = photoPath),
             contentDescription = null,
             modifier = Modifier
                 .zoomable(
@@ -392,7 +384,8 @@ private fun SplashTgsView(photoPath: String) {
     Box(
         modifier = Modifier
             .padding(16.dp)
-            .fillMaxSize(),
+            .fillMaxSize()
+            .fillMaxWidth(),
         contentAlignment = Alignment.Center
     ) {
         // Load the Lottie composition from the file path
@@ -417,7 +410,8 @@ private fun SplashMp4View(photoPath: String) {
     Box(
         modifier = Modifier
             .padding(16.dp)
-            .fillMaxSize(),
+            .fillMaxSize()
+            .fillMaxWidth(),
         contentAlignment = Alignment.Center
     ) {
         LoopingVideoPlayer(Uri.parse(photoPath))

diff --git a/app/src/main/java/com/gohj99/telewatch/LoginActivity.kt b/app/src/main/java/com/gohj99/telewatch/LoginActivity.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024-2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Copyright (c) 2024 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
  * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
  * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
  * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
@@ -273,28 +273,23 @@ class LoginActivity : ComponentActivity() {
                     }
                     // 处理其他授权状态...
                     TdApi.AuthorizationStateClosed.CONSTRUCTOR -> {
-                        // TDLib 已关闭
-                        println("TDLib 已关闭")
+                        TODO()
                     }
 
                     TdApi.AuthorizationStateClosing.CONSTRUCTOR -> {
-                        // TDLib 正在关闭
-                        println("TDLib 正在关闭")
+                        TODO()
                     }
 
                     TdApi.AuthorizationStateLoggingOut.CONSTRUCTOR -> {
-                        // 正在退出登录
-                        println("正在退出登录")
+                        TODO()
                     }
 
                     TdApi.AuthorizationStateWaitCode.CONSTRUCTOR -> {
-                        // 请求验证码
-                        println("请求验证码")
+                        TODO()
                     }
 
                     TdApi.AuthorizationStateWaitRegistration.CONSTRUCTOR -> {
-                        // 请求注册
-                        println("请求注册")
+                        TODO()
                     }
                 }
             }