Browse Source

fix test build

djoeni 3 years ago
parent
commit
968e25bc6b

+ 0 - 15
app/src/main/java/com/github/kr328/clash/ProxyActivity.kt

@@ -5,15 +5,12 @@ import com.github.kr328.clash.core.Clash
 import com.github.kr328.clash.core.model.Proxy
 import com.github.kr328.clash.design.ProxyDesign
 import com.github.kr328.clash.design.model.ProxyState
-import com.github.kr328.clash.store.TipsStore
 import com.github.kr328.clash.util.withClash
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.selects.select
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
-import java.util.concurrent.TimeUnit
 
 class ProxyActivity : BaseActivity<ProxyDesign>() {
     override suspend fun main() {
@@ -22,7 +19,6 @@ class ProxyActivity : BaseActivity<ProxyDesign>() {
         val states = List(names.size) { ProxyState("?") }
         val unorderedStates = names.indices.map { names[it] to states[it] }.toMap()
         val reloadLock = Semaphore(10)
-        val tips = TipsStore(this)
 
         val design = ProxyDesign(
             this,
@@ -33,17 +29,6 @@ class ProxyActivity : BaseActivity<ProxyDesign>() {
 
         setContentDesign(design)
 
-        launch(Dispatchers.IO) {
-            val pkg = packageManager.getPackageInfo(packageName, 0)
-            val validate = System.currentTimeMillis() - pkg.firstInstallTime > TimeUnit.DAYS.toMillis(5)
-
-            if (tips.requestDonate && validate) {
-                tips.requestDonate = false
-
-                design.requestDonate()
-            }
-        }
-
         design.requests.send(ProxyDesign.Request.ReloadAll)
 
         while (isActive) {

+ 1 - 1
build.gradle.kts

@@ -99,7 +99,7 @@ subprojects {
                         keystore.inputStream().use(this::load)
                     }
 
-                    storeFile = rootProject.file(prop.getProperty("keystore.path")!!)
+                    storeFile = rootProject.file("release.keystore")
                     storePassword = prop.getProperty("keystore.password")!!
                     keyAlias = prop.getProperty("key.alias")!!
                     keyPassword = prop.getProperty("key.password")!!

+ 0 - 17
design/src/main/java/com/github/kr328/clash/design/ProxyDesign.kt

@@ -18,7 +18,6 @@ import com.github.kr328.clash.design.util.applyFrom
 import com.github.kr328.clash.design.util.layoutInflater
 import com.github.kr328.clash.design.util.resolveThemedColor
 import com.github.kr328.clash.design.util.root
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.tabs.TabLayoutMediator
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -84,22 +83,6 @@ class ProxyDesign(
         }
     }
 
-    suspend fun requestDonate() {
-        withContext(Dispatchers.Main) {
-            val title = context.getText(R.string.request_donate)
-            val message = context.getText(R.string.request_donate_tips)
-
-            if (title.isNotEmpty() && message.isNotEmpty()) {
-                MaterialAlertDialogBuilder(context)
-                    .setTitle(R.string.request_donate)
-                    .setMessage(R.string.request_donate_tips)
-                    .setPositiveButton(R.string.ok) { _, _ -> }
-                    .setCancelable(true)
-                    .show()
-            }
-        }
-    }
-
     suspend fun showModeSwitchTips() {
         withContext(Dispatchers.Main) {
             Toast.makeText(context, R.string.mode_switch_tips, Toast.LENGTH_LONG).show()