3.3.1 (#71)

* new pastebin

* remove silk4j

* 允许卸载保留数据

Author: mzdluo123

app/build.gradle

@@ -24,8 +24,8 @@ android {
         applicationId "io.github.mzdluo123.mirai.android"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 57
-        versionName "3.3.0"
+        versionCode 58
+        versionName "3.3.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "COREVERSION", "\"$CORE_VERSION\"")
         buildConfigField("String", "CONSOLEVERSION", "\"$CONSOLE_VERSION\"")

app/libs/silk4j-1.0.jar

@@ -30,7 +30,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="HardcodedDebugMode">
+        android:hasFragileUserData="true"
+        tools:ignore="HardcodedDebugMode"
+        tools:targetApi="q">
         <activity
             android:name=".activity.CrashReportActivity"
             android:theme="@style/AppTheme"

app/src/main/AndroidManifest.xml

@@ -1,25 +1,76 @@
 package io.github.mzdluo123.mirai.android.utils
 
+import android.annotation.SuppressLint
 import io.github.mzdluo123.mirai.android.BotApplication
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.FormBody
 import okhttp3.Request
 
+@SuppressLint("SetJavaScriptEnabled")
 @OptIn(ExperimentalUnsignedTypes::class)
+//
+//suspend fun paste(text: String): String {
+//    val res = withContext(Dispatchers.IO) {
+//        BotApplication.httpClient.value.newCall(
+//            Request.Builder().url("https://paste.ubuntu.com/")
+//                .post(
+//                    FormBody.Builder().add("poster", "MiraiAndroid")
+//                        .add("syntax", "text")
+//                        .add("expiration", "")
+//                        .add("content", text).build()
+//                ).build()
+//        ).execute()
+//    }
+//
+//    return res.request.url.toString()
+//}
 
+//
 suspend fun paste(text: String): String {
     val res = withContext(Dispatchers.IO) {
         BotApplication.httpClient.value.newCall(
-            Request.Builder().url("https://paste.ubuntu.com/")
+            Request.Builder().url("https://paste.rs/web")
                 .post(
-                    FormBody.Builder().add("poster", "MiraiAndroid")
-                        .add("syntax", "text")
-                        .add("expiration", "")
+                    FormBody.Builder()
+                        .add("extension", "txt")
                         .add("content", text).build()
                 ).build()
         ).execute()
     }
-
     return res.request.url.toString()
 }
+
+
+//suspend fun paste(text: String): String {
+//    return withContext(Dispatchers.Main) {
+//        val webView = WebView(BotApplication.context)
+//
+//        webView.settings.apply {
+//            javaScriptEnabled = true
+//        }
+//        webView.webViewClient = object :WebViewClient(){
+//            override fun onPageFinished(view: WebView?, url: String?) {
+//                super.onPageFinished(view, url)
+//
+//                    webView.evaluateJavascript(
+//                        """
+//                        document.getElementById("id_expires").selectedIndex = 4
+//                        document.getElementById("id_lexer").selectedIndex = 0
+//                        document.getElementById("id_content").value = `$text`
+//                        document.getElementsByClassName("btn")[0].click()
+//                    """.trimIndent()
+//                    ) {}
+//
+//            }
+//
+//        }
+//        webView.loadUrl("https://pastebin.mozilla.org/")
+//        while (webView.url == "https://pastebin.mozilla.org/") {
+//            delay(100)
+//        }
+//        val url = webView.url ?: "上传出错"
+//        webView.destroy()
+//        url
+//    }
+//}