Fix: Folder names with apostrophes now supported

Author: ismartcoding

README.md

@@ -11,7 +11,7 @@ PlainApp is an open-source app that lets you securely manage your phone from a w
 **Privacy First**
 - All data stays on your device — no cloud, no third-party storage
 - No Firebase Messaging or Analytics; only crash logs (optional) via Firebase Crashlytics
-- Secured with TLS + ChaCha20-Poly1305 encryption
+- Secured with TLS + XChaCha20-Poly1305 encryption
 
 **Ad-Free, Always**
 - 100% ad-free experience, forever

app/build.gradle.kts

@@ -41,9 +41,9 @@ android {
                 else -> 0
             }
 
-        val vCode = 388
+        val vCode = 391
         versionCode = vCode - singleAbiNum
-        versionName = "2.1.2"
+        versionName = "2.1.3"
 
         ndk {
             //noinspection ChromeOsAbiSupport

app/src/main/java/com/ismartcoding/plain/features/nearby/NearbyDiscoverManager.kt renamed to app/src/main/java/com/ismartcoding/plain/chat/discover/NearbyDiscoverManager.kt

@@ -1,4 +1,4 @@
-package com.ismartcoding.plain.features.nearby
+package com.ismartcoding.plain.chat.discover
 
 import android.util.Base64
 import com.ismartcoding.lib.channel.sendEvent

app/src/main/java/com/ismartcoding/plain/features/nearby/NearbyPairManager.kt renamed to app/src/main/java/com/ismartcoding/plain/chat/discover/NearbyPairManager.kt

@@ -1,4 +1,4 @@
-package com.ismartcoding.plain.features.nearby
+package com.ismartcoding.plain.chat.discover
 
 import com.ismartcoding.lib.channel.sendEvent
 import com.ismartcoding.lib.helpers.CryptoHelper
@@ -18,7 +18,7 @@ import com.ismartcoding.plain.enums.NearbyMessageType
 import com.ismartcoding.plain.events.PairingCancelledEvent
 import com.ismartcoding.plain.events.PairingFailedEvent
 import com.ismartcoding.plain.events.PairingSuccessEvent
-import com.ismartcoding.plain.features.nearby.NearbyDiscoverManager.MULTICAST_PORT
+import com.ismartcoding.plain.chat.discover.NearbyDiscoverManager.MULTICAST_PORT
 import com.ismartcoding.plain.helpers.PhoneHelper
 import com.ismartcoding.plain.helpers.SignatureHelper
 import com.ismartcoding.plain.preferences.DeviceNamePreference

app/src/main/java/com/ismartcoding/plain/features/nearby/PAIRING_FLOW.md renamed to app/src/main/java/com/ismartcoding/plain/chat/discover/PAIRING_FLOW.md

@@ -1,8 +1,8 @@
-package com.ismartcoding.plain.features.nearby
+package com.ismartcoding.plain.chat.discover
 
 import com.ismartcoding.lib.helpers.CoroutinesHelper.coIO
 import com.ismartcoding.lib.logcat.LogCat
-import com.ismartcoding.plain.features.nearby.NearbyDiscoverManager.MULTICAST_PORT
+import com.ismartcoding.plain.chat.discover.NearbyDiscoverManager.MULTICAST_PORT
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.channels.trySendBlocking

app/src/main/java/com/ismartcoding/plain/features/nearby/UdpMulticastManager.kt renamed to app/src/main/java/com/ismartcoding/plain/chat/discover/UdpMulticastManager.kt

@@ -1,4 +1,4 @@
-package com.ismartcoding.plain.features.nearby
+package com.ismartcoding.plain.chat.discover
 
 import com.ismartcoding.lib.helpers.CoroutinesHelper.coIO
 import com.ismartcoding.lib.logcat.LogCat

app/src/main/java/com/ismartcoding/plain/features/nearby/UdpUnicastManager.kt renamed to app/src/main/java/com/ismartcoding/plain/chat/discover/UdpUnicastManager.kt

@@ -27,8 +27,8 @@ import com.ismartcoding.plain.features.bluetooth.BluetoothFindOneEvent
 import com.ismartcoding.plain.features.bluetooth.BluetoothPermissionResultEvent
 import com.ismartcoding.plain.features.bluetooth.BluetoothUtil
 import com.ismartcoding.plain.features.feed.FeedWorkerStatus
-import com.ismartcoding.plain.features.nearby.NearbyDiscoverManager
-import com.ismartcoding.plain.features.nearby.NearbyPairManager
+import com.ismartcoding.plain.chat.discover.NearbyDiscoverManager
+import com.ismartcoding.plain.chat.discover.NearbyPairManager
 import com.ismartcoding.plain.powerManager
 import com.ismartcoding.plain.services.HttpServerService
 import com.ismartcoding.plain.ui.models.FolderOption

app/src/main/java/com/ismartcoding/plain/events/AppEvents.kt

@@ -1,6 +1,5 @@
 package com.ismartcoding.plain.ui.models
 
-import android.content.Context
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
@@ -16,7 +15,7 @@ import com.ismartcoding.plain.events.PairingFailedEvent
 import com.ismartcoding.plain.events.PairingSuccessEvent
 import com.ismartcoding.plain.events.StartNearbyDiscoveryEvent
 import com.ismartcoding.plain.events.StopNearbyDiscoveryEvent
-import com.ismartcoding.plain.features.nearby.NearbyPairManager
+import com.ismartcoding.plain.chat.discover.NearbyPairManager
 import com.ismartcoding.plain.web.ChatApiManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job

app/src/main/java/com/ismartcoding/plain/ui/models/NearbyViewModel.kt

@@ -3,14 +3,12 @@ package com.ismartcoding.plain.ui.page.root.contents
 import android.content.BroadcastReceiver
 import android.content.Intent
 import android.content.IntentFilter
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.pager.PagerState
-import androidx.compose.material3.Switch
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -29,7 +27,7 @@ import androidx.navigation.NavHostController
 import com.ismartcoding.lib.logcat.LogCat
 import com.ismartcoding.plain.R
 import com.ismartcoding.plain.enums.DeviceType
-import com.ismartcoding.plain.features.nearby.NearbyDiscoverManager
+import com.ismartcoding.plain.chat.discover.NearbyDiscoverManager
 import com.ismartcoding.plain.preferences.LocalWeb
 import com.ismartcoding.plain.preferences.NearbyDiscoverablePreference
 import com.ismartcoding.plain.preferences.dataFlow