Handle devices in "hiddenroom" as if it were in room "hidden", so hide them from all devices #1306

Author: klassm

app/src/main/java/li/klass/fhem/adapter/rooms/RoomListAdapter.kt

@@ -36,7 +36,13 @@ import li.klass.fhem.settings.SettingsKeys.SHOW_HIDDEN_DEVICES
 import org.slf4j.LoggerFactory
 import java.util.*
 
-class RoomListAdapter(context: Context, resource: Int, data: List<String>) : ListDataAdapter<String>(context, resource, data, CASE_INSENSITIVE_COMPARATOR) {
+class RoomListAdapter(
+        context: Context,
+        resource: Int,
+        data: List<String>,
+        val hiddenRooms: Set<String>
+) : ListDataAdapter<String>(context, resource, data, CASE_INSENSITIVE_COMPARATOR) {
+
     private var selectedRoom: String? = null
 
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
@@ -67,13 +73,13 @@ class RoomListAdapter(context: Context, resource: Int, data: List<String>) : Lis
 
         val preferences = getDefaultSharedPreferences(context)
         val showHiddenDevices = preferences.getBoolean(SHOW_HIDDEN_DEVICES, false)
-        if (!showHiddenDevices) {
-            newData
-                    .filter { it.equals("hidden", ignoreCase = true) }
-                    .forEach { newData.remove(it) }
+
+        val newRooms = when (showHiddenDevices) {
+            true -> newData
+            else -> newData.filterNot { hiddenRooms.contains(it) }
         }
 
-        updateData(newData)
+        updateData(newRooms)
     }
 
     private fun setSelectedRoom(selectedRoom: String?) {
@@ -84,7 +90,7 @@ class RoomListAdapter(context: Context, resource: Int, data: List<String>) : Lis
     override fun doSort(): Boolean = true
 
     companion object {
-        val CASE_INSENSITIVE_COMPARATOR: Comparator<String> = Comparator { lhs, rhs -> lhs.toLowerCase(Locale.getDefault()).compareTo(rhs.toLowerCase(Locale.getDefault())) }
+        val CASE_INSENSITIVE_COMPARATOR: Comparator<String> = Comparator { lhs, rhs -> lhs.toLowerCase().compareTo(rhs.toLowerCase()) }
 
         private val LOG = LoggerFactory.getLogger(RoomListAdapter::class.java)
     }

app/src/main/java/li/klass/fhem/devices/list/backend/HiddenRoomsDeviceFilter.kt

@@ -26,18 +26,21 @@ package li.klass.fhem.devices.list.backend
 
 import li.klass.fhem.domain.core.RoomDeviceList
 import li.klass.fhem.settings.SettingsKeys
+import li.klass.fhem.update.backend.fhemweb.FhemWebConfigurationService
 import li.klass.fhem.util.ApplicationProperties
 import javax.inject.Inject
 
 class HiddenRoomsDeviceFilter @Inject constructor(
-        val applicationProperties: ApplicationProperties
+        val applicationProperties: ApplicationProperties,
+        val fhemWebConfigurationService: FhemWebConfigurationService
 ) {
     fun filterHiddenDevicesIfRequired(roomDeviceList: RoomDeviceList): RoomDeviceList {
         val showHiddenDevices = applicationProperties.getBooleanSharedPreference(SettingsKeys.SHOW_HIDDEN_DEVICES, false)
         if (showHiddenDevices) {
             return roomDeviceList
         }
 
-        return roomDeviceList.filter({ !it.isInRoom("hidden") })
+        val hiddenRooms = fhemWebConfigurationService.getHiddenRooms()
+        return roomDeviceList.filter { !it.isInAnyRoomsOf(hiddenRooms) }
     }
 }

app/src/main/java/li/klass/fhem/domain/core/FhemDevice.kt

@@ -112,6 +112,9 @@ class FhemDevice(val xmlListDevice: XmlListDevice) : Serializable {
      */
     fun isInRoom(room: String): Boolean = getRooms().contains(room)
 
+    fun isInAnyRoomsOf(rooms: Set<String>): Boolean =
+            getRooms().intersect(rooms).isNotEmpty()
+
     fun getRooms() = roomConcatenated.split(",")
 
     override fun equals(other: Any?): Boolean {

app/src/main/java/li/klass/fhem/room/list/ui/RoomListFragment.kt

@@ -48,6 +48,7 @@ import li.klass.fhem.room.list.backend.ViewableRoomListService
 import li.klass.fhem.service.advertisement.AdvertisementService
 import li.klass.fhem.ui.FragmentType
 import li.klass.fhem.update.backend.DeviceListUpdateService
+import li.klass.fhem.update.backend.fhemweb.FhemWebConfigurationService
 import li.klass.fhem.util.Reject
 import java.io.Serializable
 import java.util.*
@@ -63,6 +64,8 @@ open class RoomListFragment : BaseFragment() {
     lateinit var roomListService: ViewableRoomListService
     @Inject
     lateinit var appWidgetUpdateService: AppWidgetUpdateService
+    @Inject
+    lateinit var fhemWebConfigurationService: FhemWebConfigurationService
 
     private var roomName: String? = null
     private var emptyTextId = R.string.noRooms
@@ -88,7 +91,9 @@ open class RoomListFragment : BaseFragment() {
         if (superView != null) return superView
         val myActivity = activity ?: return superView
 
-        val adapter = RoomListAdapter(myActivity, R.layout.room_list_name, ArrayList<String>())
+        val hiddenRooms = fhemWebConfigurationService.getHiddenRooms()
+
+        val adapter = RoomListAdapter(myActivity, R.layout.room_list_name, ArrayList(), hiddenRooms)
         val layout = inflater.inflate(R.layout.room_list, container, false)
         advertisementService.addAd(layout, myActivity)
 

app/src/main/java/li/klass/fhem/search/SearchResultsProvider.kt

@@ -1,23 +1,28 @@
 package li.klass.fhem.search
 
+import li.klass.fhem.devices.list.backend.HiddenRoomsDeviceFilter
 import li.klass.fhem.domain.core.RoomDeviceList
 import li.klass.fhem.update.backend.DeviceListService
 import java.util.*
 import javax.inject.Inject
 
-class SearchResultsProvider @Inject constructor(val deviceListService: DeviceListService) {
+class SearchResultsProvider @Inject constructor(
+        val deviceListService: DeviceListService,
+        val hiddenRoomsDeviceFilter: HiddenRoomsDeviceFilter
+) {
     fun query(query: String): RoomDeviceList {
         if (query.trim().isEmpty()) {
             return RoomDeviceList(RoomDeviceList.ALL_DEVICES_ROOM)
         }
         val comparableQuery = toComparable(query)
         val allRoomsList = deviceListService.getAllRoomsDeviceList()
-        return allRoomsList.filter({
+        val filtered = allRoomsList.filter {
             (toComparable(it.name).contains(comparableQuery)
                     || toComparable(it.aliasOrName).contains(comparableQuery)
                     || toComparable(it.roomConcatenated).contains(comparableQuery))
-        })
+        }
 
+        return hiddenRoomsDeviceFilter.filterHiddenDevicesIfRequired(filtered)
     }
 
     private fun toComparable(input: String): String {

app/src/main/java/li/klass/fhem/update/backend/fhemweb/FhemWebConfigurationService.kt

@@ -46,22 +46,29 @@ class FhemWebConfigurationService @Inject constructor(
     }
 
     fun filterHiddenRoomsIn(roomNames: Collection<String>): Set<String> {
-        val fhemwebDevice = findFhemWebDevice() ?: return roomNames.toSet()
-        val hiddenRooms = hiddenRoomsAttributeProvider.provideFor(fhemwebDevice)
-        logger.info("filterHiddenRoomsIn - fhemwebDevice=${fhemwebDevice.name}, hiddenRoomsAttribute=${hiddenRooms.joinToString(separator = ",")}")
+        val hiddenRooms = getHiddenRooms()
+        logger.info("filterHiddenRoomsIn - hiddenRoomsAttribute=${hiddenRooms.joinToString(separator = ",")}")
 
         return roomNames.filter { it !in hiddenRooms }.toSet()
     }
 
+    fun getHiddenRooms(): Set<String> {
+        val fhemwebDevice = findFhemWebDevice()
+        val hiddenRooms = fhemwebDevice?.let { hiddenRoomsAttributeProvider.provideFor(it) }
+                ?: emptySet()
+
+        return hiddenRooms + "hidden"
+    }
+
     fun filterHiddenGroupsFrom(roomDeviceList: RoomDeviceList): RoomDeviceList {
         val fhemwebDevice = findFhemWebDevice() ?: return roomDeviceList
         val hiddenGroups = hiddenGroupsAttributeProvider.provideFor(fhemwebDevice)
         logger.info("filterHiddenGroupsFrom - fhemwebDevice=${fhemwebDevice.name}, hiddenGroupsAttribute=${hiddenGroups.joinToString(separator = ",")}")
 
-        return roomDeviceList.filter({
+        return roomDeviceList.filter {
             val groups = it.internalDeviceGroupOrGroupAttributes.map { it.toLowerCase(Locale.getDefault()) }
             !hiddenGroups.containsAll(groups)
-        })
+        }
     }
 
     fun getColumnAttributeFor(room: String): List<String> {

app/whatsnew-de.md

@@ -1 +1 @@
-TODO
+* Behandle Geräte in "hiddenrooms" als ob sie im Raum "hidden" wären. Wenn der entsprechende Schalter in den Einstellunge gesetzt ist werden damit diese Geräte auch nicht mehr im "Alle Geräte" Tab angezeigt. 

app/whatsnew-en.md

@@ -1 +1 @@
-TODO
+* Treat devices in "hiddenrooms" as if they were in room"hidden". If the respective switch in the settings has been set, those devices are also hidden from the "All devices" tab.