Skip to content

Staging #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sherlockwisdom merged 2 commits into from
Apr 8, 2025
Merged

Staging #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2158de
update: foreground notification issue fixed
sherlockwisdom Apr 8, 2025
92b5488
Merge pull request #335 from dekusms/dev
sherlockwisdom Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/com/afkanerd/deku/RemoteListeners/RMQ/RMQLongRunningConnectionWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
}
}