Merge pull request #36 from aquamarine5/v1.6-map-fix-dev

v1.6.1: Add `OtherUser.inputAddUser` and illegal channel bugfixes

Author: aquamarine5

app/build.gradle

@@ -37,8 +37,8 @@ android {
         applicationId = "org.aquamarine5.brainspark.chaoxingsignfaker"
         minSdk = 26
         targetSdk = 35
-        versionCode = 106009169
-        versionName = "1.6.0-stable-250507"
+        versionCode = 106019169
+        versionName = "1.6.1-stable-250510"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/ChaoxingPredictableException.kt

@@ -9,4 +9,7 @@ package org.aquamarine5.brainspark.chaoxingsignfaker
 open class ChaoxingPredictableException(
     override val message: String?,
     throwable: Throwable? = null
-) : Throwable(message, throwable)
+) : Throwable(message, throwable){
+    class ApplicationIllegalChannelException(
+    ) : ChaoxingPredictableException("Illegal channel detected. Please check your app version and channel.")
+}

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/ImportOtherUserActivity.kt

@@ -7,6 +7,7 @@
 package org.aquamarine5.brainspark.chaoxingsignfaker
 
 import android.content.Intent
+import android.content.pm.PackageManager.GET_META_DATA
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -44,6 +45,14 @@ import org.aquamarine5.brainspark.chaoxingsignfaker.entity.ChaoxingOtherUserShar
 class ImportOtherUserActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val versionData = packageManager.getPackageInfo(
+            packageName,
+            GET_META_DATA
+        )
+        if(UMengHelper.md5(packageManager.getApplicationLabel(versionData.applicationInfo!!).toString())!="181b23fb3bfa29181fcde41f72757e97"){
+            UMengHelper.onIllegalChannelEvent(this,versionData)
+            throw ChaoxingPredictableException.ApplicationIllegalChannelException()
+        }
         setContent {
             Scaffold { innerPadding ->
                 Column(

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/MainActivity.kt

@@ -130,10 +130,15 @@ class MainActivity : ComponentActivity() {
             if (Debug.isDebuggerConnected()) {
                 it.isEnabled = false
             }
-            val versionName = packageManager.getPackageInfo(
+            val versionData = packageManager.getPackageInfo(
                 packageName,
                 GET_META_DATA
-            ).versionName!!
+            )
+            if(UMengHelper.md5(packageManager.getApplicationLabel(versionData.applicationInfo!!).toString())!="181b23fb3bfa29181fcde41f72757e97"){
+                UMengHelper.onIllegalChannelEvent(this,versionData)
+                throw ChaoxingPredictableException.ApplicationIllegalChannelException()
+            }
+            val versionName=versionData.versionName!!
             if (versionName.contains("rc"))
                 it.environment = "rc"
             else if (versionName.contains("beta"))

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/UMengHelper.kt

@@ -7,12 +7,15 @@
 package org.aquamarine5.brainspark.chaoxingsignfaker
 
 import android.content.Context
+import android.content.pm.PackageInfo
 import com.umeng.analytics.MobclickAgent
 import com.umeng.commonsdk.UMConfigure
+import org.aquamarine5.brainspark.chaoxingsignfaker.api.ChaoxingHttpClient
 import org.aquamarine5.brainspark.chaoxingsignfaker.datastore.ChaoxingOtherUserSession
 import org.aquamarine5.brainspark.chaoxingsignfaker.entity.ChaoxingLocationSignEntity
 import org.aquamarine5.brainspark.chaoxingsignfaker.entity.ChaoxingUserEntity
 import org.aquamarine5.brainspark.stackbricks.StackbricksVersionData
+import java.security.MessageDigest
 
 object UMengHelper {
     private const val API_KEY = "67d42c1c48ac1b4f87e7edae"
@@ -25,6 +28,7 @@ object UMengHelper {
     private const val EVENT_TAG_SIGN_CLICK = "sign_click"
     private const val EVENT_TAG_ADD_OTHER_USER = "account_add_other_user"
     private const val EVENT_TAG_GOTO_SPONSOR_WECHAT = "sponsor_wechat_goto"
+    private const val EVENT_TAG_ILLEGAL_CHANNEL = "illegal_channel"
 
     private const val EVENT_TAG_STACKBRICKS_CHECK_UPDATE = "stackbricks_check_update"
     private const val EVENT_TAG_STACKBRICKS_INSTALL_NEWEST = "stackbricks_install_newest"
@@ -35,6 +39,11 @@ object UMengHelper {
     private const val EVENT_TAG_STACKBRICKS_TEST_CHANNEL_CHANGED =
         "stackbricks_test_channel_status_changed"
 
+    @OptIn(ExperimentalStdlibApi::class)
+    fun md5(str:String): String {
+        return MessageDigest.getInstance("MD5").digest(str.toByteArray()).toHexString()
+    }
+
     fun preInit(context: Context) {
         UMConfigure.preInit(context, API_KEY, API_CHANNEL)
     }
@@ -61,6 +70,19 @@ object UMengHelper {
         onEvent(context, EVENT_TAG_ACCOUNT_LOGIN, mapOf("phone" to phoneNumber))
     }
 
+    fun onIllegalChannelEvent(context: Context, applicationInfo: PackageInfo) {
+        onEvent(
+            context,
+            EVENT_TAG_ILLEGAL_CHANNEL,
+            mapOf(
+                "name" to applicationInfo.applicationInfo!!.name,
+                "label" to context.packageManager.getApplicationLabel(applicationInfo.applicationInfo!!),
+                "version" to applicationInfo.versionName.toString(),
+                "user" to ChaoxingHttpClient.instance!!.userEntity.name
+            )
+        )
+    }
+
     suspend fun onSignLocationEvent(
         context: Context,
         postLocationEntity: ChaoxingLocationSignEntity,

app/src/main/java/org/aquamarine5/brainspark/chaoxingsignfaker/api/ChaoxingHttpClient.kt

@@ -305,15 +305,7 @@ class ChaoxingHttpClient private constructor(
                         phoneNumber,
                         encryptedPassword,
                         getInfo(tempOkHttpClient).name
-                    ).apply {
-                        context.chaoxingDataStore.updateData { datastore ->
-                            datastore.toBuilder().setLoginSession(
-                                datastore.loginSession.toBuilder()
-                                    .setPassword(encryptedPassword)
-                                    .setPhoneNumber(phoneNumber).build()
-                            ).build()
-                        }
-                    }
+                    )
                 }
             }