SagerNet/sing-box-for-android
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box-for-android.git synced 2025-04-05 04:47:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes

Browse source
This commit is contained in:
世界 2023-08-06 08:06:50 +08:00
parent 90da262add
commit e525812dc7
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/io/nekohasekai/sfa/bg/ServiceNotification.kt
View file

@ -24,10 +24,7 @@ class ServiceNotification(private val service: Service) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
return true return true
} }
if (Application.notification.areNotificationsEnabled()) { return Application.notification.areNotificationsEnabled()
return true
}
return false
} }
} }
@ -36,7 +33,7 @@ class ServiceNotification(private val service: Service) {
NotificationCompat.Builder(service, notificationChannel).setWhen(0) NotificationCompat.Builder(service, notificationChannel).setWhen(0)
.setContentTitle("sing-box") .setContentTitle("sing-box")
.setContentText("service started").setOnlyAlertOnce(true) .setContentText("service started").setOnlyAlertOnce(true)
.setSmallIcon(R.drawable.ic_launcher_foreground) .setSmallIcon(R.drawable.ic_menu)
.setCategory(NotificationCompat.CATEGORY_SERVICE) .setCategory(NotificationCompat.CATEGORY_SERVICE)
.setContentIntent( .setContentIntent(
PendingIntent.getActivity( PendingIntent.getActivity(

20
app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
View file

@ -274,15 +274,17 @@ class GroupsFragment : Fragment(), CommandClientHandler {
RecyclerView.ViewHolder(binding.root) { RecyclerView.ViewHolder(binding.root) {
fun bind(groupView: GroupView, group: OutboundGroup, item: OutboundGroupItem) { fun bind(groupView: GroupView, group: OutboundGroup, item: OutboundGroupItem) {
binding.itemCard.setOnClickListener { if (group.selectable) {
binding.selectedView.isVisible = true binding.itemCard.setOnClickListener {
groupView.updateSelected(group, item) binding.selectedView.isVisible = true
GlobalScope.launch { groupView.updateSelected(group, item)
runCatching { GlobalScope.launch {
Libbox.newStandaloneCommandClient().selectOutbound(group.tag, item.tag) runCatching {
}.onFailure { Libbox.newStandaloneCommandClient().selectOutbound(group.tag, item.tag)
withContext(Dispatchers.Main) { }.onFailure {
binding.root.context.errorDialogBuilder(it).show() withContext(Dispatchers.Main) {
binding.root.context.errorDialogBuilder(it).show()
}
} }
} }
} }

3
app/src/main/java/io/nekohasekai/sfa/ui/main/ConfigurationFragment.kt
View file

@ -169,9 +169,6 @@ class ConfigurationFragment : Fragment() {
val popup = PopupMenu(button.context, button) val popup = PopupMenu(button.context, button)
popup.setForceShowIcon(true) popup.setForceShowIcon(true)
popup.menuInflater.inflate(R.menu.profile_menu, popup.menu) popup.menuInflater.inflate(R.menu.profile_menu, popup.menu)
if (profile.typed.type != TypedProfile.Type.Remote) {
popup.menu.removeItem(R.id.action_share)
}
popup.setOnMenuItemClickListener { popup.setOnMenuItemClickListener {
when (it.itemId) { when (it.itemId) {
R.id.action_share -> { R.id.action_share -> {

BIN
app/src/main/res/drawable/ic_menu.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB