1.0.13

Author: Troplo

.idea/deploymentTargetDropDown.xml

@@ -1,3 +1,3 @@
 ![TroploPrivateUploader Banner](https://i.troplo.com/i/9ea16d8ab178.png)
-# TPUvNATIVE
-The native Android client for TPU.
+# Flowinity Kotlin (formerly PrivateUploader)
+The native Android client for Flowinity.

.idea/deploymentTargetSelector.xml

@@ -31,12 +31,11 @@ android {
         applicationId = "com.troplo.privateuploader"
         minSdk = 28
         targetSdk = 34
-        versionCode = 12
-        versionName = "1.0.12"
+        versionCode = 13
+        versionName = "1.0.13"
         multiDexEnabled = true
-        buildConfigField("String", "SERVER_URL", "\"https://privateuploader.com\"")
+        buildConfigField("String", "SERVER_URL", "\"https://flowinity.com\"")
         buildConfigField("String", "BUILD_TIME", "\"${DateFormat.getDateTimeInstance().format(System.currentTimeMillis())}\"")
-        buildConfigField("Integer", "BETA_VERSION", "6")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -48,7 +47,7 @@ android {
         release {
             isMinifyEnabled = true
             isShrinkResources = true
-            buildConfigField("String", "SERVER_URL", "\"https://privateuploader.com\"")
+            buildConfigField("String", "SERVER_URL", "\"https://flowinity.com\"")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

README.md

@@ -189,7 +189,7 @@ class FirebaseChatService : FirebaseMessagingService() {
                     .build()
 
                 val replyAction = NotificationCompat.Action.Builder(
-                    R.drawable.tpu_logo,
+                    R.drawable.flowinity_logo,
                     "Reply",
                     replyPendingIntent
                 )
@@ -203,7 +203,7 @@ class FirebaseChatService : FirebaseMessagingService() {
                         .setStyle(style)
                         .setContentText(message.content)
                         .setContentTitle(message.username)
-                        .setSmallIcon(R.drawable.tpu_logo)
+                        .setSmallIcon(R.drawable.flowinity_logo)
                         .setWhen(TpuFunctions.getDate(message.createdAt)?.time ?: 0)
                         .addAction(replyAction)
                         .setContentIntent(

app/build.gradle.kts

@@ -154,11 +154,12 @@ class MainActivity : ComponentActivity() {
         }
     }
 
-    public fun upload(files: List<UploadTarget>, deleteOnceFinished: Boolean = true, context: Context = this) {
+    public fun upload(files: List<UploadTarget>, deleteOnceFinished: Boolean = true, context: Context = this): List<String>? {
+        var uploads = mutableListOf<String>()
         Log.d("TPU.Upload", "Uploading ${files.size} files")
 
         if(!files.any()) {
-            return
+            return null
         }
 
         if(deleteOnceFinished) {
@@ -210,8 +211,16 @@ class MainActivity : ComponentActivity() {
                     }
                     Log.d("TPU.Upload", "Upload finished: ${upload[0].upload.attachment}, ${UploadStore.uploads.toList().toString()}")
                 }
+
+                uploads = upload.map { it.upload.attachment }.toMutableList()
+            }
+
+            return@launch withContext(Dispatchers.Main) {
+                uploads
             }
         }
+
+        return null
     }
 
     @Deprecated("Deprecated in Java :(")

app/src/main/ic_launcher-playstore.png

@@ -1,12 +1,18 @@
 package com.troplo.privateuploader.components.chat
 
+import android.Manifest
+import android.util.Log
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.OpenInNew
 import androidx.compose.material.icons.filled.GifBox
 import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.filled.OpenInNew
 import androidx.compose.material.icons.filled.Smartphone
 import androidx.compose.material.icons.filled.Star
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -23,19 +29,28 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.core.net.toUri
 import androidx.lifecycle.ViewModel
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import com.troplo.privateuploader.MainActivity
 import com.troplo.privateuploader.api.ChatStore
 import com.troplo.privateuploader.api.stores.UploadStore
 import com.troplo.privateuploader.api.stores.UserStore
 import com.troplo.privateuploader.components.chat.attachment.MyDevice
 import com.troplo.privateuploader.data.model.Upload
 import com.troplo.privateuploader.data.model.UploadTarget
 import com.troplo.privateuploader.screens.GalleryScreen
+import com.troplo.privateuploader.screens.getFileName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalPermissionsApi::class)
 @Composable
 fun Attachment(openBottomSheet: MutableState<Boolean>) {
     val windowInsets = WindowInsets(0)
@@ -49,14 +64,29 @@ fun Attachment(openBottomSheet: MutableState<Boolean>) {
         windowInsets = windowInsets,
         modifier = Modifier.defaultMinSize(minHeight = 400.dp)
     ) {
+        val context = LocalContext.current
+        val launcher = rememberLauncherForActivityResult(ActivityResultContracts.OpenMultipleDocuments()) { data ->
+            Log.d("TPU.UploadResponse", "Upload response received, data: $data")
+            for (uri in data) {
+                UploadStore.uploads.add(
+                    UploadTarget(
+                        uri = uri,
+                        started = false,
+                        progress = 0f,
+                        name = getFileName(uri, context)
+                    )
+                )
+            }
+        }
+
         TabRow(
             selectedTabIndex = selectedTab.value,
             contentColor = MaterialTheme.colorScheme.onSurface
         ) {
             Tab(
                 selected = selectedTab.value == 0,
                 onClick = { selectedTab.value = 0 },
-                text = { Text("My Device") },
+                text = { Text("Device") },
                 icon = { Icon(Icons.Default.Smartphone, contentDescription = "My Device") }
             )
             Tab(
@@ -77,6 +107,19 @@ fun Attachment(openBottomSheet: MutableState<Boolean>) {
                 text = { Text("GIFs") },
                 icon = { Icon(Icons.Default.GifBox, contentDescription = "GIFs") }
             )
+
+            val filesPermissionState = rememberPermissionState(
+                Manifest.permission.READ_EXTERNAL_STORAGE
+            )
+
+            Tab(
+                selected = selectedTab.value == 4,
+                onClick = {
+                    launcher.launch(arrayOf("*/*"))
+                },
+                text = { Text("Other") },
+                icon = { Icon(Icons.AutoMirrored.Filled.OpenInNew, contentDescription = "Open in File Manager") }
+            )
         }
 
         fun onClick(upload: Upload, tenor: Boolean = false) {