1.0.10

Author: Troplo

.idea/gradle.xml

@@ -6,6 +6,12 @@ plugins {
     id("com.google.gms.google-services")
 }
 
+sentry {
+    autoUploadProguardMapping
+    autoUploadNativeSymbols
+    autoUploadSourceContext
+}
+
 android {
     namespace = "com.troplo.privateuploader"
     compileSdk = 34
@@ -14,8 +20,8 @@ android {
         applicationId = "com.troplo.privateuploader"
         minSdk = 28
         targetSdk = 34
-        versionCode = 8
-        versionName = "1.0.8"
+        versionCode = 10
+        versionName = "1.0.10"
         multiDexEnabled = true
         buildConfigField("String", "SERVER_URL", "\"https://privateuploader.com\"")
         buildConfigField("String", "BUILD_TIME", "\"${System.currentTimeMillis()}\"")
@@ -29,7 +35,8 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             buildConfigField("String", "SERVER_URL", "\"https://privateuploader.com\"")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
@@ -95,15 +102,15 @@ dependencies {
     implementation("io.coil-kt:coil:2.3.0")
     implementation("com.github.jeziellago:compose-markdown:0.3.3")
     implementation("com.github.bumptech.glide:compose:1.0.0-alpha.1")
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
+    implementation("com.squareup.retrofit2:retrofit:2.10.0-SNAPSHOT")
+    implementation("com.squareup.retrofit2:converter-moshi:2.10.0-SNAPSHOT")
     implementation("com.squareup.moshi:moshi:1.12.0")
     implementation("com.squareup.moshi:moshi-kotlin:1.12.0")
     implementation("com.github.bumptech.glide:glide:4.16.0-SNAPSHOT")
     implementation("com.squareup.okhttp3:logging-interceptor:4.9.1")
     implementation("androidx.core:core-ktx:1.10.1")
     implementation("com.google.code.gson:gson:2.10.1")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
+    implementation("com.squareup.retrofit2:converter-gson:2.10.0-SNAPSHOT")
     implementation("io.socket:socket.io-client:2.1.0") {
         exclude("org.json", "json")
     }

app/build.gradle.kts

@@ -18,4 +18,25 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-dontwarn kotlinx.serialization.DeserializationStrategy
+-dontwarn kotlinx.serialization.KSerializer
+-dontwarn kotlinx.serialization.Serializable
+-dontwarn kotlinx.serialization.builtins.BuiltinSerializersKt
+-dontwarn kotlinx.serialization.internal.ArrayListSerializer
+-dontwarn kotlinx.serialization.internal.GeneratedSerializer
+-dontwarn kotlinx.serialization.internal.PluginGeneratedSerialDescriptor
+-dontwarn kotlinx.serialization.internal.StringSerializer
+-dontwarn kotlinx.serialization.json.Json
+-dontwarn kotlinx.serialization.json.JsonBuilder
+-dontwarn kotlinx.serialization.json.JsonKt
+-dontwarn kotlinx.serialization.json.JvmStreamsKt
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+-keep class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+-keepnames class com.fasterxml.jackson.databind.** { *; }
+-dontwarn com.fasterxml.jackson.databind.**

app/proguard-rules.pro

@@ -22,17 +22,25 @@ import kotlin.math.ln
 import kotlin.math.pow
 
 object TpuFunctions {
-    fun image(link: String?, recipient: User?): String? {
+    fun image(link: String?, recipient: User?, width: Int? = null, height: Int? = null): String? {
         if (recipient?.avatar != null) {
-            return "https://i.troplo.com/i/${recipient.avatar}"
+            var string = "https://i.troplo.com/i/${recipient.avatar}"
+            if (width != null && height != null) {
+                string += "?width=$width&height=$height"
+            }
+            return string
         }
         if (link == null) {
             return null
         }
         return if (link.length >= 20) {
             "https://colubrina.troplo.com/usercontent/$link"
         } else {
-            "https://i.troplo.com/i/$link"
+            var string = "https://i.troplo.com/i/$link"
+            if (width != null && height != null) {
+                string += "?width=$width&height=$height"
+            }
+            return string
         }
     }
 

app/src/main/java/com/troplo/privateuploader/api/Functions.kt

@@ -7,7 +7,9 @@ import coil.decode.GifDecoder
 import coil.decode.ImageDecoderDecoder
 import coil.disk.DiskCache
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.newFixedThreadPoolContext
 
+val dispatcher = newFixedThreadPoolContext(2, "CoilDispatcherTPU")
 fun imageLoader(context: Context, cache: Boolean? = true): ImageLoader {
     return ImageLoader.Builder(context)
         .components {
@@ -17,7 +19,7 @@ fun imageLoader(context: Context, cache: Boolean? = true): ImageLoader {
                 add(GifDecoder.Factory())
             }
         }
-        .dispatcher(Dispatchers.IO)
+        .dispatcher(dispatcher)
         .diskCache {
             if (cache == true) {
                 DiskCache.Builder()

app/src/main/java/com/troplo/privateuploader/api/ImageLoader.kt

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -147,7 +148,9 @@ fun Embed(embed: Embed) {
             }
 
             else -> {
-                Card {
+                Card(
+                    modifier = Modifier.width(300.dp).heightIn(0.dp, 200.dp)
+                ) {
                     Text(
                         text = "The version of TPUvNATIVE you are using does not yet support the embed type ${embed.type}!",
                         modifier = Modifier.padding(16.dp)
@@ -157,7 +160,7 @@ fun Embed(embed: Embed) {
         }
     } else {
         Card(
-            modifier = Modifier.width(300.dp)
+            modifier = Modifier.width(300.dp).heightIn(0.dp, 200.dp)
         ) {
             Box(
                 modifier = Modifier.fillMaxSize(),

app/src/main/java/com/troplo/privateuploader/components/chat/Embed.kt

@@ -38,7 +38,7 @@ import io.noties.markwon.linkify.LinkifyPlugin
 
 @Composable
 fun MarkdownText(
-    markdown: String,
+    content: String,
     modifier: Modifier = Modifier,
     color: Color = Color.Unspecified,
     fontSize: TextUnit = TextUnit.Unspecified,
@@ -76,7 +76,7 @@ fun MarkdownText(
             )
         },
         update = { textView ->
-            markdownRender.setMarkdown(textView, markdown)
+            markdownRender.setMarkdown(textView, content)
             if (onTextLayout != null) {
                 textView.post {
                     onTextLayout(textView.lineCount)