From e525812dc79a7c515b3c895d0f77363aaacf437a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Sun, 6 Aug 2023 08:06:50 +0800
Subject: [PATCH] Fixes

---
 .../nekohasekai/sfa/bg/ServiceNotification.kt |   7 ++----
 .../sfa/ui/dashboard/GroupsFragment.kt        |  20 ++++++++++--------
 .../sfa/ui/main/ConfigurationFragment.kt      |   3 ---
 app/src/main/res/drawable/ic_menu.png         | Bin 0 -> 2108 bytes
 4 files changed, 13 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_menu.png

diff --git a/app/src/main/java/io/nekohasekai/sfa/bg/ServiceNotification.kt b/app/src/main/java/io/nekohasekai/sfa/bg/ServiceNotification.kt
index 781b5a0..0c50003 100644
--- a/app/src/main/java/io/nekohasekai/sfa/bg/ServiceNotification.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/bg/ServiceNotification.kt
@@ -24,10 +24,7 @@ class ServiceNotification(private val service: Service) {
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
                 return true
             }
-            if (Application.notification.areNotificationsEnabled()) {
-                return true
-            }
-            return false
+            return Application.notification.areNotificationsEnabled()
         }
     }
 
@@ -36,7 +33,7 @@ class ServiceNotification(private val service: Service) {
         NotificationCompat.Builder(service, notificationChannel).setWhen(0)
             .setContentTitle("sing-box")
             .setContentText("service started").setOnlyAlertOnce(true)
-            .setSmallIcon(R.drawable.ic_launcher_foreground)
+            .setSmallIcon(R.drawable.ic_menu)
             .setCategory(NotificationCompat.CATEGORY_SERVICE)
             .setContentIntent(
                 PendingIntent.getActivity(
diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
index 0958ab2..b6399e7 100644
--- a/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/ui/dashboard/GroupsFragment.kt
@@ -274,15 +274,17 @@ class GroupsFragment : Fragment(), CommandClientHandler {
         RecyclerView.ViewHolder(binding.root) {
 
         fun bind(groupView: GroupView, group: OutboundGroup, item: OutboundGroupItem) {
-            binding.itemCard.setOnClickListener {
-                binding.selectedView.isVisible = true
-                groupView.updateSelected(group, item)
-                GlobalScope.launch {
-                    runCatching {
-                        Libbox.newStandaloneCommandClient().selectOutbound(group.tag, item.tag)
-                    }.onFailure {
-                        withContext(Dispatchers.Main) {
-                            binding.root.context.errorDialogBuilder(it).show()
+            if (group.selectable) {
+                binding.itemCard.setOnClickListener {
+                    binding.selectedView.isVisible = true
+                    groupView.updateSelected(group, item)
+                    GlobalScope.launch {
+                        runCatching {
+                            Libbox.newStandaloneCommandClient().selectOutbound(group.tag, item.tag)
+                        }.onFailure {
+                            withContext(Dispatchers.Main) {
+                                binding.root.context.errorDialogBuilder(it).show()
+                            }
                         }
                     }
                 }
diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/main/ConfigurationFragment.kt b/app/src/main/java/io/nekohasekai/sfa/ui/main/ConfigurationFragment.kt
index e58e71d..1b3b9c4 100644
--- a/app/src/main/java/io/nekohasekai/sfa/ui/main/ConfigurationFragment.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/ui/main/ConfigurationFragment.kt
@@ -169,9 +169,6 @@ class ConfigurationFragment : Fragment() {
                 val popup = PopupMenu(button.context, button)
                 popup.setForceShowIcon(true)
                 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 {
                     when (it.itemId) {
                         R.id.action_share -> {
diff --git a/app/src/main/res/drawable/ic_menu.png b/app/src/main/res/drawable/ic_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..f61e73e540a6b311132383e01f46b9debb2f0f9a
GIT binary patch
literal 2108
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

literal 0
HcmV?d00001