Dev

app/build.gradle

@@ -114,7 +114,7 @@ android {
 dependencies {
     implementation project(':smswithoutborders_libsignal-doubleratchet')
 //    implementation project(':smswithoutborders_libsmsmms:lib_smsmms_android')
-    implementation 'com.github.smswithoutborders:lib_smsmms_android:12cee57'
+    implementation 'com.github.smswithoutborders:lib_smsmms_android:59254e709b'
 
     implementation libs.androidx.room.testing
     implementation libs.androidx.activity

app/src/main/AndroidManifest.xml

@@ -6,24 +6,9 @@
         android:name="android.hardware.telephony"
         android:required="false" />
 
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_SMS" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
-    <uses-permission android:name="android.permission.RECEIVE_MMS" />
-    <uses-permission android:name="android.permission.RECEIVE_WAP_PUSH" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-
     <uses-permission android:name="android.permission.READ_LOGS" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-
-    <uses-permission android:name="android.permission.WRITE_SMS"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />

app/src/main/java/com/afkanerd/deku/MainActivity.kt

@@ -28,7 +28,9 @@ import com.afkanerd.deku.DefaultSMS.ui.components.KeyExchangeType
 import com.afkanerd.deku.DefaultSMS.ui.viewModels.SecureConversationViewModel
 import com.afkanerd.deku.RemoteListeners.Models.RemoteListener.RemoteListenerQueuesViewModel
 import com.afkanerd.deku.RemoteListeners.Models.RemoteListener.RemoteListenersViewModel
+import com.afkanerd.deku.RemoteListeners.ui.RMQAddComposable
 import com.afkanerd.deku.RemoteListeners.ui.RMQMainComposable
+import com.afkanerd.deku.RemoteListeners.ui.RMQQueuesComposable
 import com.afkanerd.deku.Router.ui.GatewayClientsMainView
 import com.afkanerd.deku.Router.ui.RoutedMessagesMainView
 import com.afkanerd.deku.Router.ui.viewModels.GatewayServerViewModel
@@ -107,7 +109,7 @@ class MainActivity : AppCompatActivity(){
                                                     )
                                                 },
                                                 onClick = {
-                                                    navController.navigate(RemoteForwardingScreen)
+                                                    navController.navigate(RemoteListenersScreen)
                                                     it(false)
                                                 }
                                             )
@@ -147,6 +149,18 @@ class MainActivity : AppCompatActivity(){
                                             KeyExchangeType(it)
                                         }
                                     ) {
+                                        composable<RemoteListenersQueuesScreen> {
+                                            RMQQueuesComposable(
+                                                remoteListenersViewModel = remoteListenersViewModel,
+                                                navController = navController
+                                            )
+                                        }
+                                        composable<RemoteListenersAddScreen> {
+                                            RMQAddComposable(
+                                                remoteListenerViewModel = remoteListenersViewModel,
+                                                navController = navController
+                                            )
+                                        }
                                         composable<RemoteListenersScreen> {
                                             RMQMainComposable(
                                                 remoteListenerViewModel = remoteListenersViewModel,

app/src/main/java/com/afkanerd/deku/Router/ui/modals/GatewayClientAddModalSMTP.kt

@@ -9,7 +9,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonColors
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -21,7 +20,6 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.rememberStandardBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -30,7 +28,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
@@ -140,7 +137,7 @@ fun GatewayServerAddSmtpModal(
                     value = subject,
                     onValueChange = {},
                     label = {
-                        Text(stringResource(R.string.enter_url))
+                        Text(stringResource(R.string.enter_subject))
                     },
                 )
 

app/src/main/res/values/strings.xml

@@ -450,5 +450,6 @@
     <string name="to_1">To</string>
     <string name="secure_message_requested">Secure message requested</string>
     <string name="secure_message_accepted">Secure message accepted</string>
+    <string name="enter_subject">Enter subject</string>
 
 </resources>

gradle.properties

@@ -6,13 +6,12 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-org.gradle.parallel=true
-org.gradle.daemon=true
+# org.gradle.parallel=true
+# org.gradle.daemon=true
 org.gradle.caching=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
@@ -23,8 +22,6 @@ android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
-kotlin.incremental=true
-org.gradle.configureondemand=true
 
 GROUP=com.afkanerd.oss1
 POM_ARTIFACT_ID=smswithoutborders_libsignal

settings.gradle

@@ -9,4 +9,4 @@ dependencyResolutionManagement {
 rootProject.name = "swob_server"
 include ':app'
 include ':smswithoutborders_libsignal-doubleratchet'
-//include ':smswithoutborders_libsmsmms:lib_smsmms_android'
+// include ':smswithoutborders_libsmsmms:lib_smsmms_android'

version.properties

@@ -1,5 +1,5 @@
 releaseVersion=0
-stagingVersion=62
+stagingVersion=63
 nightlyVersion=0
-versionName=0.62.0
-tagVersion=68
+versionName=0.63.0
+tagVersion=70