Merge pull request #336 from dekusms/staging

Staging

Author: sherlockwisdom

app/src/main/AndroidManifest.xml

@@ -90,14 +90,6 @@
         <activity
             android:name=".AboutActivity"
             android:exported="false"/>
-        <activity
-            android:name="com.afkanerd.deku.RemoteListeners.Models.GatewayClientAddActivity"
-            android:exported="false"
-            android:parentActivityName="com.afkanerd.deku.RemoteListeners.Models.GatewayClientListingActivity" />
-        <activity
-            android:name="com.afkanerd.deku.RemoteListeners.Models.GatewayClientListingActivity"
-            android:exported="false"
-            android:parentActivityName=".SettingsActivity" />
         <activity
             android:name=".SettingsActivity"
             android:exported="false"/>
@@ -112,10 +104,6 @@
         <activity
             android:name="com.afkanerd.deku.Router.GatewayServers.GatewayServerRoutedActivity"
             android:exported="false"/>
-        <activity
-            android:name=".DefaultCheckActivity"
-            android:exported="true">
-        </activity>
 
         <receiver
             android:name=".BroadcastReceivers.IncomingDataSMSBroadcastReceiver"
@@ -182,18 +170,6 @@
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="dataSync" /> <!-- <meta-data -->
-        <!-- android:name="preloaded_fonts" -->
-        <!-- android:resource="@array/preloaded_fonts" /> &lt;!&ndash; <provider &ndash;&gt; -->
-        <!-- android:name="androidx.startup.InitializationProvider" -->
-        <!-- android:authorities="${applicationId}.androidx-startup" -->
-        <!-- android:exported="false" -->
-        <!-- tools:node="merge"> -->
-        <!-- &lt;!&ndash; If you are using androidx.startup to initialize other components &ndash;&gt; -->
-        <!-- <meta-data -->
-        <!-- android:name="androidx.work.WorkManagerInitializer" -->
-        <!-- android:value="androidx.startup" -->
-        <!-- tools:node="remove" /> -->
-        <!-- </provider> -->
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"

app/src/main/java/com/afkanerd/deku/RemoteListeners/RMQ/RMQLongRunningConnectionWorker.kt

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.pm.ServiceInfo
 import android.os.Build
 import android.provider.Settings.Global.getString
+import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.work.CoroutineWorker
 import androidx.work.ForegroundInfo
@@ -55,6 +56,10 @@ class RMQLongRunningConnectionWorker(context: Context, parameters: WorkerParamet
                     flags = Notification.FLAG_ONGOING_EVENT
                 }
 
-        return ForegroundInfo(0, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            ForegroundInfo(0, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+        } else {
+            ForegroundInfo(0, notification)
+        }
     }
 }