Merge pull request #757 from SUPLA/v25.09

V25.09

Author: przemyslawzygmunt

app/src/main/assets/supla_org_cert.crt

@@ -0,0 +1,38 @@
+-----BEGIN CERTIFICATE-----
+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
+b+hI
+-----END CERTIFICATE-----

app/src/main/java/org/supla/android/core/infrastructure/CurrentWifiNetworkInfoProvider.kt

@@ -59,8 +59,9 @@ class CurrentWifiNetworkInfoProvider @Inject constructor(
           Trace.i(CurrentWifiNetworkInfoProvider::class.simpleName, "onCapabilitiesChanged ${wifiInfo?.ssid}")
           wifiInfo?.let {
             networkInfo = NetworkInfo(
-              it.ssid?.skipQuotation()?.skipUnknownSsid(),
-              it.networkId
+              ssid = it.ssid?.skipQuotation()?.skipUnknownSsid(),
+              networkId = it.networkId,
+              networkType = if (it.frequency < 2500) NetworkType.TYPE_2_4_GHZ else NetworkType.TYPE_5_GHZ
             )
           }
         }
@@ -84,15 +85,21 @@ class CurrentWifiNetworkInfoProvider @Inject constructor(
       wifiManager.connectionInfo?.let {
         NetworkInfo(
           ssid = it.ssid?.skipQuotation()?.skipUnknownSsid(),
-          networkId = it.networkId
+          networkId = it.networkId,
+          networkType = if (it.frequency < 2500) NetworkType.TYPE_2_4_GHZ else NetworkType.TYPE_5_GHZ
         )
       }
     }
 
   data class NetworkInfo(
     val ssid: String?,
-    val networkId: Int
+    val networkId: Int,
+    val networkType: NetworkType
   )
+
+  enum class NetworkType {
+    TYPE_2_4_GHZ, TYPE_5_GHZ
+  }
 }
 
 private fun String.skipUnknownSsid(): String? =

app/src/main/java/org/supla/android/core/shared/LocalizedStringIdExtensions.kt

@@ -132,6 +132,11 @@ val LocalizedStringId.resourceId: Int
     LocalizedStringId.ADD_WIZARD_RESULT_CONNECTION_ERROR -> R.string.wizard_result_conn_error
     LocalizedStringId.ADD_WIZARD_RESULT_FAILED -> R.string.wizard_result_failed
     LocalizedStringId.ADD_WIZARD_RECONNECT_TIMEOUT -> R.string.wizard_reconnect_timeout
+    LocalizedStringId.ADD_WIZARD_DEVICE_TEMPORARILY_LOCKED -> R.string.add_wizard_device_temporarily_locked
+    LocalizedStringId.ADD_WIZARD_STATE_PREPARING -> R.string.wizard_state_preparing
+    LocalizedStringId.ADD_WIZARD_STATE_CONNECTING -> R.string.wizard_state_connecting
+    LocalizedStringId.ADD_WIZARD_STATE_CONFIGURING -> R.string.wizard_state_configuring
+    LocalizedStringId.ADD_WIZARD_STATE_FINISHING -> R.string.wizard_state_finishing
 
     LocalizedStringId.CHANNEL_STATE_UPTIME -> R.string.channel_state_uptime
     LocalizedStringId.LAST_CONNECTION_RESET_CAUSE_UNKNOWN -> R.string.lastconnectionresetcause_unknown

app/src/main/java/org/supla/android/data/model/electricitymeter/ElectricityMeterSettings.kt

@@ -56,6 +56,7 @@ data class ElectricityMeterSettings(
       SuplaElectricityMeasurementType.FORWARD_ACTIVE_ENERGY,
       SuplaElectricityMeasurementType.REVERSE_ACTIVE_ENERGY,
       SuplaElectricityMeasurementType.POWER_ACTIVE,
+      SuplaElectricityMeasurementType.POWER_ACTIVE_KW,
       SuplaElectricityMeasurementType.VOLTAGE
     )
 

app/src/main/java/org/supla/android/data/source/ChannelRepository.java

@@ -68,10 +68,6 @@ public interface ChannelRepository {
 
   void updateLocation(Location location);
 
-  Cursor getAllProfileChannels(Long profileId);
-
-  Cursor getAllProfileChannelGroups(Long profileId);
-
   @NotNull
   List<Location> getAllLocations();
 }

app/src/main/java/org/supla/android/data/source/DefaultChannelRepository.java

@@ -231,23 +231,6 @@ public void updateLocation(@Nullable Location location) {
     locationDao.update(location);
   }
 
-  @Override
-  public Cursor getAllProfileChannels(Long profileId) {
-    return channelDao.getAllChannels(
-        ChannelView.COLUMN_CHANNEL_FUNCTION
-            + " <> 0 "
-            + " AND (C."
-            + ChannelView.COLUMN_CHANNEL_PROFILE_ID
-            + " = "
-            + profileId
-            + ") ");
-  }
-
-  @Override
-  public Cursor getAllProfileChannelGroups(Long profileId) {
-    return channelDao.getAllChannelGroupsForProfileId(profileId);
-  }
-
   @NonNull
   @Override
   public List<Location> getAllLocations() {

app/src/main/java/org/supla/android/data/source/local/ChannelDao.java

@@ -187,32 +187,6 @@ public Cursor getChannelListCursorWithDefaultOrder(String where) {
     return getChannelListCursor(orderBY, where);
   }
 
-  public Cursor getAllChannels(String where) {
-    String orderBY =
-        "L."
-            + LocationEntity.COLUMN_SORT_ORDER
-            + ", "
-            + "L."
-            + LocationEntity.COLUMN_CAPTION
-            + " COLLATE LOCALIZED, "
-            + "C."
-            + ChannelEntity.COLUMN_POSITION
-            + ", "
-            + "C."
-            + ChannelView.COLUMN_CHANNEL_FUNCTION
-            + " DESC, "
-            + "C."
-            + ChannelView.COLUMN_CHANNEL_CAPTION
-            + " COLLATE LOCALIZED";
-
-    return getChannelListCursor(orderBY, where);
-  }
-
-  public Cursor getAllChannelGroupsForProfileId(Long profileId) {
-    return getChannelGroupListCursor(
-        "G." + ChannelGroupEntity.COLUMN_PROFILE_ID + " = " + profileId);
-  }
-
   public boolean isZWaveBridgeChannelAvailable() {
     String[] projection = {ChannelView.COLUMN_CHANNEL_ID};
 

app/src/main/java/org/supla/android/data/source/local/SceneDao.kt

@@ -85,7 +85,7 @@ class SceneDao(dap: DatabaseAccessProvider) : BaseDao(dap) {
         selectionArgs = arrayOf(profileId.toString())
       }
       val order = SceneView.COLUMN_LOCATION_SORT_ORDER + ", " +
-        SceneView.COLUMN_LOCATION_NAME + " COLLATE LOCALIZED, " +
+        SceneView.COLUMN_LOCATION_NAME + " COLLATE UNICODE, " +
         SceneEntity.COLUMN_SORT_ORDER + ", " +
         SceneEntity.COLUMN_CAPTION + " COLLATE LOCALIZED, " +
         SceneEntity.COLUMN_REMOTE_ID

app/src/main/java/org/supla/android/data/source/local/dao/ChannelDao.kt

@@ -389,7 +389,7 @@ interface ChannelDao {
       AND channel.$COLUMN_VISIBLE > 0
     ORDER BY
       location.${LocationEntity.COLUMN_SORT_ORDER},
-      location.${LocationEntity.COLUMN_CAPTION} COLLATE LOCALIZED,
+      location.${LocationEntity.COLUMN_CAPTION} COLLATE UNICODE,
       channel.${ChannelEntity.COLUMN_POSITION},
       channel.${ChannelEntity.COLUMN_FUNCTION} DESC,
       channel.$COLUMN_CAPTION COLLATE LOCALIZED

app/src/main/java/org/supla/android/data/source/remote/esp/EspCommonNameValidationInterceptor.kt

@@ -0,0 +1,64 @@
+package org.supla.android.data.source.remote.esp
+/*
+ Copyright (C) AC SOFTWARE SP. Z O.O.
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import java.io.IOException
+import java.security.cert.X509Certificate
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class EspCommonNameValidationInterceptor @Inject constructor(
+  private val session: EspConfigurationSession
+) : Interceptor {
+  override fun intercept(chain: Interceptor.Chain): Response =
+    if (session.useSecureLayer) {
+      val response = chain.proceed(chain.request())
+      val commonNameHeader = response.headers["CN"]
+      val commonNameCertificate = findCommonNameInCertificate(response)
+
+      if (commonNameHeader != null && commonNameCertificate != null && commonNameHeader == commonNameCertificate) {
+        response
+      } else {
+        throw IOException("Different common names (certificate `$commonNameCertificate`, response `$commonNameHeader`)")
+      }
+    } else {
+      chain.proceed(chain.request())
+    }
+
+  private fun findCommonNameInCertificate(response: Response): String? {
+    response.handshake?.let { handshake ->
+      for (certificate in handshake.peerCertificates) {
+        (certificate as? X509Certificate)?.let {
+          return extractCnFromCertificate(it)
+        }
+      }
+    }
+
+    return null
+  }
+
+  fun extractCnFromCertificate(certificate: X509Certificate): String? {
+    val subjectDn = certificate.subjectX500Principal.name
+    val cnPattern = "CN=([^,]+)".toRegex()
+    val matchResult = cnPattern.find(subjectDn)
+    return matchResult?.groups?.get(1)?.value
+  }
+}