From cec2b7d56c9f97ce00ed71c4a2bc0c1ecbfccbe8 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Tue, 31 Aug 2021 17:44:45 +0300
Subject: [PATCH 01/33] ISSUE #448 Remove claimed and shared sensors when on
 logging out

---
 .../station/dashboard/ui/DashboardActivity.kt |  8 +++--
 .../ui/DashboardActivityViewModel.kt          |  4 ++-
 .../station/database/domain/LocalDatabase.kt  | 10 +++++-
 .../domain/SensorSettingsRepository.kt        |  3 +-
 .../station/database/domain/TagRepository.kt  | 16 +++++++---
 .../station/database/tables/SensorSettings.kt |  5 ++-
 .../network/di/NetworkInjectionModule.kt      |  2 +-
 .../network/domain/NetworkTokenRepository.kt  | 31 ++++++++++++++-----
 .../network/domain/RuuviNetworkInteractor.kt  | 13 ++++++--
 .../tagdetails/ui/TagDetailsActivity.kt       |  9 +++---
 .../tagdetails/ui/TagDetailsViewModel.kt      |  4 ++-
 .../domain/TagSettingsInteractor.kt           |  2 +-
 .../tagsettings/ui/TagSettingsActivity.kt     |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 14 files changed, 80 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt
index 4c1b4244c..c680a49a5 100644
--- a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt
@@ -208,9 +208,7 @@ class DashboardActivity : AppCompatActivity(), KodeinAware {
     }
 
     private fun login(signedIn: Boolean) {
-        if (signedIn == false) {
-            SignInActivity.start(this)
-        } else {
+        if (signedIn) {
             val builder = AlertDialog.Builder(this)
             with(builder)
             {
@@ -223,6 +221,9 @@ class DashboardActivity : AppCompatActivity(), KodeinAware {
                 }
                 show()
             }
+        } else {
+            SignInActivity.start(this)
+
         }
     }
 
@@ -239,6 +240,7 @@ class DashboardActivity : AppCompatActivity(), KodeinAware {
     }
 
     private fun updateMenu(signed: Boolean) {
+        networkLayout.isVisible = viewModel.userEmail.value?.isNotEmpty() == true
         val loginMenuItem = navigationView.menu.findItem(R.id.loginMenuItem)
         loginMenuItem?.let {
             it.title = if (signed) {
diff --git a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivityViewModel.kt b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivityViewModel.kt
index 636a0ff05..9b7d7f073 100644
--- a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivityViewModel.kt
+++ b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivityViewModel.kt
@@ -89,6 +89,8 @@ class DashboardActivityViewModel(
     }
 
     fun signOut() {
-        tokenRepository.signOut()
+        tokenRepository.signOut {
+            updateTags()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/database/domain/LocalDatabase.kt b/app/src/main/java/com/ruuvi/station/database/domain/LocalDatabase.kt
index 33d3d25cc..c3cf3e319 100644
--- a/app/src/main/java/com/ruuvi/station/database/domain/LocalDatabase.kt
+++ b/app/src/main/java/com/ruuvi/station/database/domain/LocalDatabase.kt
@@ -13,7 +13,15 @@ import com.ruuvi.station.database.tables.*
 class LocalDatabase {
     companion object {
         const val NAME = "LocalDatabase"
-        const val VERSION = 23
+        const val VERSION = 24
+    }
+
+    @Migration(version = 24, database = LocalDatabase::class)
+    class Migration24(table: Class<SensorSettings?>?) : AlterTableMigration<SensorSettings?>(table) {
+        override fun onPreMigrate() {
+            super.onPreMigrate()
+            addColumn(SQLiteType.INTEGER, "networkSensor")
+        }
     }
 
     @Migration(version = 23, database = LocalDatabase::class)
diff --git a/app/src/main/java/com/ruuvi/station/database/domain/SensorSettingsRepository.kt b/app/src/main/java/com/ruuvi/station/database/domain/SensorSettingsRepository.kt
index dd14c5783..821d4c460 100644
--- a/app/src/main/java/com/ruuvi/station/database/domain/SensorSettingsRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/database/domain/SensorSettingsRepository.kt
@@ -104,9 +104,10 @@ class SensorSettingsRepository {
             .execute()
     }
 
-    fun setSensorOwner(sensorId: String, owner: String) {
+    fun setSensorOwner(sensorId: String, owner: String, isNetworkSensor: Boolean) {
         var settings = getSensorSettingsOrCreate(sensorId)
         settings.owner = owner
+        settings.networkSensor = isNetworkSensor
         settings.update()
     }
 
diff --git a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
index b22b3d747..1fa282ebb 100644
--- a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
@@ -65,20 +65,26 @@ class TagRepository(
         return if (queryResult != null) tagConverter.fromDatabase(queryResult) else null
     }
 
-    fun deleteTagsAndRelatives(tag: RuuviTagEntity) {
+    fun deleteSensorAndRelatives(sensorId: String) {
+        getTagById(sensorId)?.let {
+            deleteSensorAndRelatives(it)
+        }
+    }
+
+    fun deleteSensorAndRelatives(sensor: RuuviTagEntity) {
         SQLite.delete(Alarm::class.java)
-            .where(Alarm_Table.ruuviTagId.eq(tag.id))
+            .where(Alarm_Table.ruuviTagId.eq(sensor.id))
             .execute()
 
         SQLite.delete(TagSensorReading::class.java)
-            .where(TagSensorReading_Table.ruuviTagId.eq(tag.id))
+            .where(TagSensorReading_Table.ruuviTagId.eq(sensor.id))
             .execute()
 
         SQLite.delete(SensorSettings::class.java)
-            .where(SensorSettings_Table.id.eq(tag.id))
+            .where(SensorSettings_Table.id.eq(sensor.id))
             .execute()
 
-        tag.delete()
+        sensor.delete()
     }
 
     fun updateTag(tag: RuuviTagEntity) {
diff --git a/app/src/main/java/com/ruuvi/station/database/tables/SensorSettings.kt b/app/src/main/java/com/ruuvi/station/database/tables/SensorSettings.kt
index b70f3d621..383cf7086 100644
--- a/app/src/main/java/com/ruuvi/station/database/tables/SensorSettings.kt
+++ b/app/src/main/java/com/ruuvi/station/database/tables/SensorSettings.kt
@@ -41,7 +41,9 @@ data class SensorSettings(
     @Column
     var lastSync: Date? = null,
     @Column
-    var networkLastSync: Date? = null
+    var networkLastSync: Date? = null,
+    @Column
+    var networkSensor: Boolean = false
 ): BaseModel() {
     val displayName get() = if (name.isNullOrEmpty()) id else name.toString()
 
@@ -81,6 +83,7 @@ data class SensorSettings(
         humidityOffset = sensor.offsetHumidity
         pressureOffset = sensor.offsetPressure
         temperatureOffset = sensor.offsetTemperature
+        networkSensor = true
         update()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt b/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
index 1a7203e80..95e370b45 100644
--- a/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
+++ b/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
@@ -10,7 +10,7 @@ object NetworkInjectionModule {
     val module = Kodein.Module(NetworkInjectionModule.javaClass.name) {
         bind<RuuviNetworkRepository>() with singleton { RuuviNetworkRepository(Dispatchers.IO, instance()) }
 
-        bind<NetworkTokenRepository>() with singleton { NetworkTokenRepository(instance()) }
+        bind<NetworkTokenRepository>() with singleton { NetworkTokenRepository(instance(), instance(), instance()) }
 
         bind<RuuviNetworkInteractor>() with singleton { RuuviNetworkInteractor(instance(), instance(), instance(), instance()) }
 
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/NetworkTokenRepository.kt b/app/src/main/java/com/ruuvi/station/network/domain/NetworkTokenRepository.kt
index 60f9a4102..eed284400 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/NetworkTokenRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/NetworkTokenRepository.kt
@@ -1,10 +1,15 @@
 package com.ruuvi.station.network.domain
 
 import com.ruuvi.station.app.preferences.Preferences
+import com.ruuvi.station.database.domain.SensorSettingsRepository
+import com.ruuvi.station.database.domain.TagRepository
 import com.ruuvi.station.network.data.NetworkTokenInfo
+import kotlinx.coroutines.*
 
 class NetworkTokenRepository (
-    private val preferences: Preferences
+    private val preferences: Preferences,
+    private val sensorSettingsRepository: SensorSettingsRepository,
+    private val tagRepository: TagRepository
 ) {
     fun saveTokenInfo(tokenInfo: NetworkTokenInfo) {
         setNetworkTokenInfo(tokenInfo)
@@ -12,16 +17,28 @@ class NetworkTokenRepository (
 
     fun getTokenInfo(): NetworkTokenInfo? = getNetworkTokenInfo()
 
-    fun signOut() {
-        saveTokenInfo(NetworkTokenInfo("", ""))
-        preferences.lastSyncDate = Long.MIN_VALUE
+    fun signOut(finished: ()->Unit) {
+        CoroutineScope(Dispatchers.IO).launch {
+            saveTokenInfo(NetworkTokenInfo("", ""))
+            preferences.lastSyncDate = Long.MIN_VALUE
+
+            val sensors = sensorSettingsRepository.getSensorSettings()
+            for (sensor in sensors) {
+                if (sensor.networkSensor) {
+                    tagRepository.deleteSensorAndRelatives(sensor.id)
+                }
+            }
+            withContext(Dispatchers.Main){
+                finished()
+            }
+        }
     }
 
     private fun getNetworkTokenInfo(): NetworkTokenInfo? {
-        if (preferences.networkEmail.isEmpty() || preferences.networkToken.isEmpty()) {
-            return null
+        return if (preferences.networkEmail.isEmpty() || preferences.networkToken.isEmpty()) {
+            null
         } else {
-            return NetworkTokenInfo(preferences.networkEmail, preferences.networkToken)
+            NetworkTokenInfo(preferences.networkEmail, preferences.networkToken)
         }
     }
 
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
index 1b3c9e804..0d0861d4d 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
@@ -96,12 +96,19 @@ class RuuviNetworkInteractor (
                 try {
                     networkRepository.claimSensor(request, token) { claimResponse ->
                         if (claimResponse?.isSuccess() == true) {
-                            sensorSettingsRepository.setSensorOwner(sensorSettings.id, getEmail()
-                                ?: "")
+                            sensorSettingsRepository.setSensorOwner(
+                                sensorSettings.id,
+                                getEmail() ?: "",
+                                true
+                            )
                         } else {
                             val maskedEmail = Regex("\\b\\S*@\\S*\\.\\S*\\b").find(claimResponse?.error ?: "")?.value
                             if (maskedEmail?.isNotEmpty() == true) {
-                                sensorSettingsRepository.setSensorOwner(sensorSettings.id, maskedEmail)
+                                sensorSettingsRepository.setSensorOwner(
+                                    sensorSettings.id,
+                                    maskedEmail,
+                                    false
+                                )
                             }
                         }
                         getUserInfo {
diff --git a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
index cf563057c..a69a04df9 100644
--- a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
@@ -345,9 +345,7 @@ class TagDetailsActivity : AppCompatActivity(), KodeinAware {
     }
 
     private fun login(signedIn: Boolean) {
-        if (!signedIn) {
-            SignInActivity.start(this)
-        } else {
+        if (signedIn) {
             val builder = AlertDialog.Builder(this)
             with(builder)
             {
@@ -360,6 +358,8 @@ class TagDetailsActivity : AppCompatActivity(), KodeinAware {
                 }
                 show()
             }
+        } else {
+            SignInActivity.start(this)
         }
     }
 
@@ -377,6 +377,7 @@ class TagDetailsActivity : AppCompatActivity(), KodeinAware {
     }
 
     private fun updateMenu(signed: Boolean) {
+        networkLayout.isVisible = viewModel.userEmail.value?.isNotEmpty() == true
         val loginMenuItem = navigationView.menu.findItem(R.id.loginMenuItem)
         loginMenuItem?.let {
             it.title = if (signed) {
@@ -531,7 +532,7 @@ class TagDetailsActivity : AppCompatActivity(), KodeinAware {
         }
 
         override fun getPageTitle(position: Int): String {
-            return tags[position].displayName.toUpperCase(Locale.getDefault())
+            return tags.elementAtOrNull(position)?.displayName?.toUpperCase(Locale.getDefault()) ?: ""
         }
 
         override fun getItemPosition(`object`: Any): Int {
diff --git a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt
index db84ef87d..2429a9b68 100644
--- a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt
+++ b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt
@@ -158,6 +158,8 @@ class TagDetailsViewModel(
     }
 
     fun signOut() {
-        tokenRepository.signOut()
+        tokenRepository.signOut {
+            refreshTags()
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/tagsettings/domain/TagSettingsInteractor.kt b/app/src/main/java/com/ruuvi/station/tagsettings/domain/TagSettingsInteractor.kt
index 9f314f6e1..312e4fd89 100644
--- a/app/src/main/java/com/ruuvi/station/tagsettings/domain/TagSettingsInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/tagsettings/domain/TagSettingsInteractor.kt
@@ -27,7 +27,7 @@ class TagSettingsInteractor(
     fun deleteTagsAndRelatives(tag: RuuviTagEntity) {
         val sensorId = tag.id.toString()
         val sensorSettings = sensorSettingsRepository.getSensorSettings(sensorId)
-        tagRepository.deleteTagsAndRelatives(tag)
+        tagRepository.deleteSensorAndRelatives(tag)
         sensorSettings?.owner?.let { owner ->
             if (sensorSettings.owner == networkInteractor.getEmail()) {
                 networkInteractor.unclaimSensor(sensorId)
diff --git a/app/src/main/java/com/ruuvi/station/tagsettings/ui/TagSettingsActivity.kt b/app/src/main/java/com/ruuvi/station/tagsettings/ui/TagSettingsActivity.kt
index 56121d87b..47f175c51 100644
--- a/app/src/main/java/com/ruuvi/station/tagsettings/ui/TagSettingsActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/tagsettings/ui/TagSettingsActivity.kt
@@ -108,7 +108,7 @@ class TagSettingsActivity : AppCompatActivity(), KodeinAware {
             )
             binding.ownerValueTextView.text = sensorSettings?.owner ?: "None"
 
-            if (sensorSettings?.owner.isNullOrEmpty()) {
+            if (sensorSettings?.networkSensor != true) {
                 deleteString = getString(R.string.remove_local_sensor)
                 binding.ownerLayout.isEnabled = true
                 binding.ownerValueTextView.setCompoundDrawablesWithIntrinsicBounds(null, null, getDrawable(R.drawable.ic_baseline_arrow_forward_ios_24), null)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b3a5c6b68..ed3ac4ce4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -250,7 +250,7 @@
     <string name="sign_in_request_code">Request a Code</string>
     <string name="sign_in_submit_button">Submit</string>
     <string name="sign_out">Sign out</string>
-    <string name="sign_out_confirm">Do you want sign out?</string>
+    <string name="sign_out_confirm">When you sign out, sensors of which ownerships you\'ve claimed on the sensor settings page, will be automatically removed from the app. When you sign in again using the same email address, the sensors will be returned from the cloud.\n\n Do you want sign out?</string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">dBm</string>

From 32ff7e75577ddaf7e5aa32e40ba71b2ab4c4fa9f Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Tue, 31 Aug 2021 18:49:57 +0300
Subject: [PATCH 02/33] ISSUE #452 Unification: rename Ruuvi Network to Ruuvi
 cloud

---
 app/src/main/res/values-fi/strings.xml | 12 ++++++------
 app/src/main/res/values-ru/strings.xml |  2 +-
 app/src/main/res/values/strings.xml    |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index cc88d6dc1..0e81436a7 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -58,7 +58,7 @@
     <string name="charts_background_dialog_description">Historiatietojen kerääminen toimii parhaiten taustaskannauksen ollessa käytössä.</string>
     <string name="charts_background_dialog_title_question">Haluatko ottaa käyttöön taustaskannauksen?</string>
     <string name="claim_description">Omistatko tämän anturin? Vahvista omistajuus ja anturi lisätään Ruuvi-tilillesi. Jokaisella Ruuvi-anturilla voi olla vain yksi omistaja.\n\nHyödyt:\n\n ● Anturien nimet, taustakuvat, kalibrointi- ja hälytystiedot turvallisesta pilvipalvelusta\n\n ● Lue anturitiedot etänä verkossa (vaatii Ruuvi Gateway -reitittimen)\n\n ● Jaa antureita ystävien ja perheen kesken (vaatii Ruuvi Gateway -reitittimen)\n\n ● Jopa 2 vuoden historiatiedot osoitteesta station.ruuvi.com (vaatii Ruuvi Gateway -reitittimen)</string>
-    <string name="claim_ownership">VAHVISTA OMISTAJUUS</string>
+    <string name="claim_ownership">Vahvista Omistajuus</string>
     <string name="claim_sensor">Vahvista omistajuus</string>
     <string name="clear">Pyyhi</string>
     <string name="clear_confirm">Tyhjennetäänkö sovellukseen tallennetut historiatiedot?</string>
@@ -123,8 +123,8 @@
     <string name="language_french">Français</string>
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
-    <string name="login_description">Hyödynnä kaikki Ruuvi Network mahdollisuudet! Kirjaudu sisään tai luo uusi Ruuvi-käyttäjätili antamalla sähköpostiosoitteesi.</string>
-    <string name="login_to_ruuvi_network">Kirjaudu\nRuuvi\nNetworkiin</string>
+    <string name="login_description">Hyödynnä Ruuvi-pilvipalvelun mahdollisuudet! Kirjaudu sisään tai luo uusi Ruuvi-käyttäjätili antamalla sähköpostiosoitteesi.</string>
+    <string name="login_to_ruuvi_network">Kirjaudu\nRuuvi\ncloudiin</string>
     <string name="mac_address">MAC-osoite</string>
     <string name="mac_copied">MAC-osoite kopioitu leikepöydälle</string>
     <string name="measurement_sequence_number">Mittausjärjestysnumero</string>
@@ -141,7 +141,7 @@
     <string name="navigation_drawer_close">Sulje siirtymisvalikko</string>
     <string name="navigation_drawer_open">Avaa siirtymisvalikko</string>
     <string name="network_sharing_disabled">Voit jakaa vain Ruuvi Gateway -reitittimen läheisyydessä olevia antureita. Lisätietoja reitittimestä osoitteesta ruuvi.com</string>
-    <string name="network_status_title">Ruuvi Networkin tila</string>
+    <string name="network_status_title">Ruuvi cloudin tila</string>
     <string name="network_sync_result_exception">Synkronointi epäonnistui: %1$s</string>
     <string name="network_sync_result_not_logged">Synkronointi epäonnistui: kirjaudu ensin</string>
     <string name="network_sync_result_success">Synkronointi onnistui!</string>
@@ -249,7 +249,7 @@
     <string name="sign_in_request_code">Pyydä kirjautumiskoodi</string>
     <string name="sign_in_submit_button">Lähetä</string>
     <string name="sign_out">Kirjaudu ulos</string>
-    <string name="sign_out_confirm">Haluatko varmasti kirjautua ulos?</string>
+    <string name="sign_out_confirm">Anturit, joiden omistajuuden olet vahvistanut asetussivulla poistetaan sovelluksesta automaattisesti uloskirjauduttaessa. Anturitiedot palautetaan pilvipalvelusta samalla sähköpostiosoitteella uudelleenkirjauduttaessa.\n\n Haluatko varmasti kirjautua ulos?</string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">dBm</string>
@@ -263,7 +263,7 @@
     <string name="synchronizing">Synkronoidaan</string>
     <string name="tag_name">Anturin nimi</string>
     <string name="tag_not_in_range">Anturia ei löydetty. Onko laite lähettyvillä?</string>
-    <string name="tagsettings_claim_button">Lukitse</string>
+    <string name="tagsettings_claim_button">Vahvista</string>
     <string name="tagsettings_network_info">VERKON TIEDOT</string>
     <string name="tagsettings_owner">Omistaja</string>
     <string name="tagsettings_sensor_remove">Poista</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2c2459ebe..1bb25d772 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -121,7 +121,7 @@
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
     <string name="login_description">Чтобы воспользоваться всеми функциями, создайте аккаунт или войдите в существующий. Пожалуйста, введите ваш email.</string>
-    <string name="login_to_ruuvi_network">Войти в\nRuuvi\nNetwork</string>
+    <string name="login_to_ruuvi_network">Войти в\nRuuvi\ncloud</string>
     <string name="mac_address">MAC адрес</string>
     <string name="mac_copied">MAC адрес скопирован в буфер обмена</string>
     <string name="measurement_sequence_number">Порядковый Номер Измерения</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed3ac4ce4..07e49eedd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,7 +59,7 @@
     <string name="charts_background_dialog_description">Charts feature works best with background scanning enabled.</string>
     <string name="charts_background_dialog_title_question">Would you like to enable background scanning?</string>
     <string name="claim_description">Do you own this sensor? If yes, please claim ownership of the sensor and it\'ll be added to your Ruuvi account. Every Ruuvi sensor can have only one owner.\n\nBenefits:\n\n ● Sensor names, background images, offsets and alert settings will be securely stored in the cloud\n\n ● Access sensors remotely over the Internet (requires a Ruuvi Gateway)\n\n ● Share sensors with friends and family (requires a Ruuvi Gateway)\n\n ● Browse up to 2 years of history on station.ruuvi.com (requires a Ruuvi Gateway)</string>
-    <string name="claim_ownership">CLAIM OWNERSHIP</string>
+    <string name="claim_ownership">Claim Ownership</string>
     <string name="claim_sensor">Claim sensor</string>
     <string name="clear">Clear</string>
     <string name="clear_confirm">Clear the historical data from the app?</string>
@@ -125,7 +125,7 @@
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
     <string name="login_description">To enjoy all the features, create an account or login to your existing Ruuvi account by entering your email address.</string>
-    <string name="login_to_ruuvi_network">Login to\nRuuvi\nNetwork</string>
+    <string name="login_to_ruuvi_network">Login to\nRuuvi\ncloud</string>
     <string name="mac_address">MAC Address</string>
     <string name="mac_copied">MAC address copied to clipboard</string>
     <string name="measurement_sequence_number">Measurement Sequence Number</string>
@@ -142,7 +142,7 @@
     <string name="navigation_drawer_close">Close the navigation drawer</string>
     <string name="navigation_drawer_open">Open the navigation drawer</string>
     <string name="network_sharing_disabled">Only sensors within range of your Ruuvi Gateway can be shared. If you don\'t have one, get it on ruuvi.com</string>
-    <string name="network_status_title">Ruuvi Network status</string>
+    <string name="network_status_title">Ruuvi Cloud status</string>
     <string name="network_sync_result_exception">Synchronization failed: %1$s</string>
     <string name="network_sync_result_not_logged">Synchronization failed: need to log in first</string>
     <string name="network_sync_result_success">Synchronized successfully!</string>

From 2b7a77a5c3b7b5b7ff2266b5807deb2aeda528d2 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Tue, 31 Aug 2021 18:51:22 +0300
Subject: [PATCH 03/33] ISSUE #452 Unification: rename Ruuvi Network to Ruuvi
 cloud

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07e49eedd..93f45a116 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -142,7 +142,7 @@
     <string name="navigation_drawer_close">Close the navigation drawer</string>
     <string name="navigation_drawer_open">Open the navigation drawer</string>
     <string name="network_sharing_disabled">Only sensors within range of your Ruuvi Gateway can be shared. If you don\'t have one, get it on ruuvi.com</string>
-    <string name="network_status_title">Ruuvi Cloud status</string>
+    <string name="network_status_title">Ruuvi cloud status</string>
     <string name="network_sync_result_exception">Synchronization failed: %1$s</string>
     <string name="network_sync_result_not_logged">Synchronization failed: need to log in first</string>
     <string name="network_sync_result_success">Synchronized successfully!</string>

From f0ba0ed3843f439f004d85c593ea704901a9e277 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Tue, 31 Aug 2021 18:54:05 +0300
Subject: [PATCH 04/33] version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 671c304fb..9ff2c367f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15033
-        versionName "1.5.33"
+        versionCode 15034
+        versionName "1.5.34"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

From 0085a5dd449148f4adbe44ab548243a74b873876 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 1 Sep 2021 23:15:31 +0300
Subject: [PATCH 05/33] ISSUE #469 Refresh cloud data automatically and
 simplify the menu

---
 .../station/app/RuuviScannerApplication.kt    | 11 +----
 .../station/dashboard/ui/DashboardActivity.kt | 43 +------------------
 .../ui/DashboardActivityViewModel.kt          |  4 --
 .../domain/NetworkDataSyncInteractor.kt       | 27 ++++++++++++
 .../tagdetails/ui/TagDetailsActivity.kt       | 43 +------------------
 .../tagdetails/ui/TagDetailsViewModel.kt      |  4 --
 app/src/main/res/layout/navigation_drawer.xml | 41 ++++++------------
 app/src/main/res/values-fi/strings.xml        | 14 +++---
 app/src/main/res/values-fr/strings.xml        |  9 +---
 app/src/main/res/values-ru/strings.xml        |  9 ++--
 app/src/main/res/values-sv/strings.xml        | 11 ++---
 app/src/main/res/values/strings.xml           | 23 +++++-----
 12 files changed, 71 insertions(+), 168 deletions(-)

diff --git a/app/src/main/java/com/ruuvi/station/app/RuuviScannerApplication.kt b/app/src/main/java/com/ruuvi/station/app/RuuviScannerApplication.kt
index 34fd556f4..03898a5d1 100644
--- a/app/src/main/java/com/ruuvi/station/app/RuuviScannerApplication.kt
+++ b/app/src/main/java/com/ruuvi/station/app/RuuviScannerApplication.kt
@@ -52,13 +52,14 @@ class RuuviScannerApplication : Application(), KodeinAware {
         override fun onBecameForeground() {
             isInForeground = true
             defaultOnTagFoundListener.isForeground = true
-            updateNetwork()
+            networkDataSyncInteractor.startAutoRefresh()
             runtimeBehavior.refreshFeatureFlags()
         }
 
         override fun onBecameBackground() {
             isInForeground = false
             defaultOnTagFoundListener.isForeground = false
+            networkDataSyncInteractor.stopAutoRefresh()
         }
     }
 
@@ -89,8 +90,6 @@ class RuuviScannerApplication : Application(), KodeinAware {
         foreground.addListener(listener)
 
         setupExperimentalFeatures()
-
-        updateNetwork()
     }
 
     private fun setupDependencyInjection() {
@@ -111,10 +110,4 @@ class RuuviScannerApplication : Application(), KodeinAware {
             runtimeFeatureFlagProvider.setFeatureEnabled(FeatureFlag.RUUVI_NETWORK, true)
         }
     }
-
-    private fun updateNetwork() {
-        if (networkInteractor.signedIn && Date(preferencesRepository.getLastSyncDate()).diffGreaterThan(60*1000)) {
-            networkDataSyncInteractor.syncNetworkData()
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt
index c680a49a5..eb1b2f439 100644
--- a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt
@@ -153,33 +153,6 @@ class DashboardActivity : AppCompatActivity(), KodeinAware {
             return@setNavigationItemSelectedListener true
         }
 
-        syncLayout.setOnClickListener {
-            viewModel.networkDataSync()
-        }
-
-        viewModel.syncResultObserve.observe(this) {syncResult ->
-            val message = when (syncResult.type) {
-                NetworkSyncResultType.NONE -> ""
-                NetworkSyncResultType.SUCCESS -> getString(R.string.network_sync_result_success)
-                NetworkSyncResultType.EXCEPTION -> getString(R.string.network_sync_result_exception, syncResult.errorMessage)
-                NetworkSyncResultType.NOT_LOGGED -> getString(R.string.network_sync_result_not_logged)
-            }
-            if (message.isNotEmpty()) {
-                Snackbar.make(mainDrawerLayout, message, Snackbar.LENGTH_SHORT).show()
-                viewModel.syncResultShowed()
-            }
-        }
-
-        viewModel.syncInProgressObserve.observe(this) {
-            if (it) {
-                Timber.d("Sync in progress")
-                syncNetworkButton.startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_indefinitely))
-            } else {
-                Timber.d("Sync not in progress")
-                syncNetworkButton.clearAnimation()
-            }
-        }
-
         viewModel.userEmail.observe(this) {
             var user = it
             if (user.isNullOrEmpty()) {
@@ -189,21 +162,7 @@ class DashboardActivity : AppCompatActivity(), KodeinAware {
                 signedIn = true
             }
             updateMenu(signedIn)
-            loggedUserTextView.text = getString(R.string.network_user, user)
-        }
-
-        viewModel.syncStatus.observe(this) {syncStatus->
-            if (syncStatus.syncInProgress) {
-                syncStatusTextView.text = getString(R.string.connected_reading_info)
-            } else {
-                val lastSyncString =
-                    if (syncStatus.lastSync == Long.MIN_VALUE) {
-                        getString(R.string.never)
-                    } else {
-                        Date(syncStatus.lastSync).describingTimeSince(this)
-                    }
-                syncStatusTextView.text = getString(R.string.network_synced, lastSyncString)
-            }
+            loggedUserTextView.text = user
         }
     }
 
diff --git a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivityViewModel.kt b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivityViewModel.kt
index 9b7d7f073..bfaa81033 100644
--- a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivityViewModel.kt
+++ b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivityViewModel.kt
@@ -74,10 +74,6 @@ class DashboardActivityViewModel(
         }
     }
 
-    fun networkDataSync() {
-        networkDataSyncInteractor.syncNetworkData()
-    }
-
     fun syncResultShowed() {
         networkDataSyncInteractor.syncStatusShowed()
     }
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
index bd29f9463..c163b64ec 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
@@ -43,12 +43,39 @@ class NetworkDataSyncInteractor (
     @Volatile
     private var syncJob: Job? = null
 
+    @Volatile
+    private var autoRefreshJob: Job? = null
+
     private val syncResult = MutableStateFlow<NetworkSyncResult> (NetworkSyncResult(NetworkSyncResultType.NONE))
     val syncResultFlow: StateFlow<NetworkSyncResult> = syncResult
 
     private val syncInProgress = MutableStateFlow<Boolean> (false)
     val syncInProgressFlow: StateFlow<Boolean> = syncInProgress
 
+    fun startAutoRefresh() {
+        Timber.d("startAutoRefresh")
+        if (autoRefreshJob != null && autoRefreshJob?.isActive == true) {
+            Timber.d("Already in auto refresh mode")
+            return
+        }
+
+        autoRefreshJob = CoroutineScope(IO).launch {
+            while (true) {
+                Timber.d("Cloud auto refresh another round")
+                if (networkInteractor.signedIn &&
+                    Date(preferencesRepository.getLastSyncDate()).diffGreaterThan(60*1000)) {
+                    syncNetworkData()
+                }
+                delay(65 * 1000)
+            }
+        }
+    }
+
+    fun stopAutoRefresh() {
+        Timber.d("stopAutoRefresh")
+        autoRefreshJob?.cancel()
+    }
+
     fun syncNetworkData() {
         if (syncJob != null && syncJob?.isActive == true) {
             Timber.d("Already in sync mode")
diff --git a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
index a69a04df9..a20a1c251 100644
--- a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
@@ -290,33 +290,6 @@ class TagDetailsActivity : AppCompatActivity(), KodeinAware {
             return@setNavigationItemSelectedListener true
         }
 
-        syncLayout.setOnClickListener {
-            viewModel.networkDataSync()
-        }
-
-        viewModel.syncResultObserve.observe(this) {syncResult ->
-            val message = when (syncResult.type) {
-                NetworkSyncResultType.NONE -> ""
-                NetworkSyncResultType.SUCCESS -> getString(R.string.network_sync_result_success)
-                NetworkSyncResultType.EXCEPTION -> getString(R.string.network_sync_result_exception, syncResult.errorMessage)
-                NetworkSyncResultType.NOT_LOGGED -> getString(R.string.network_sync_result_not_logged)
-            }
-            if (message.isNotEmpty()) {
-                Snackbar.make(mainDrawerLayout, message, Snackbar.LENGTH_SHORT).show()
-                viewModel.syncResultShowed()
-            }
-        }
-
-        viewModel.syncInProgressObserve.observe(this) {
-            if (it) {
-                Timber.d("Sync in progress")
-                syncNetworkButton.startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_indefinitely))
-            } else {
-                Timber.d("Sync not in progress")
-                syncNetworkButton.clearAnimation()
-            }
-        }
-
         viewModel.userEmail.observe(this) {
             var user = it
             if (user.isNullOrEmpty()) {
@@ -326,21 +299,7 @@ class TagDetailsActivity : AppCompatActivity(), KodeinAware {
                 signedIn = true
             }
             updateMenu(signedIn)
-            loggedUserTextView.text = getString(R.string.network_user, user)
-        }
-
-        viewModel.syncStatus.observe(this) {syncStatus ->
-            if (syncStatus.syncInProgress) {
-                syncStatusTextView.text = getString(R.string.connected_reading_info)
-            } else {
-                val lastSyncString =
-                if (syncStatus.lastSync == Long.MIN_VALUE) {
-                    getString(R.string.never)
-                } else {
-                    Date(syncStatus.lastSync).describingTimeSince(this)
-                }
-                syncStatusTextView.text = getString(R.string.network_synced, lastSyncString)
-            }
+            loggedUserTextView.text = user
         }
     }
 
diff --git a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt
index 2429a9b68..3d37cc1ba 100644
--- a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt
+++ b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt
@@ -143,10 +143,6 @@ class TagDetailsViewModel(
         }
     }
 
-    fun networkDataSync() {
-        networkDataSyncInteractor.syncNetworkData()
-    }
-
     fun syncResultShowed() {
         networkDataSyncInteractor.syncStatusShowed()
     }
diff --git a/app/src/main/res/layout/navigation_drawer.xml b/app/src/main/res/layout/navigation_drawer.xml
index e563eba4a..925451522 100644
--- a/app/src/main/res/layout/navigation_drawer.xml
+++ b/app/src/main/res/layout/navigation_drawer.xml
@@ -14,8 +14,9 @@
     android:background="@android:color/white" >
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_height="match_parent"
         android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="24dp"
         android:orientation="vertical">
 
         <androidx.appcompat.widget.LinearLayoutCompat
@@ -23,41 +24,25 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintBottom_toBottomOf="parent"
+            tools:layout_editor_absoluteX="0dp">
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/networkStatusTextView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:textStyle="bold"
-                android:text="@string/network_status_title"/>
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                android:text="@string/logged_in"
+                android:textStyle="bold" />
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/loggedUserTextView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                tools:text="@string/network_user"/>
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:id="@+id/syncLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-            <ImageView
-                android:id="@+id/syncNetworkButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_baseline_sync_24"
-                android:layout_margin="8dp" />
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/syncStatusTextView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:gravity="center|start"
-                tools:text="Syncronized 1 day ago"/>
-        </androidx.appcompat.widget.LinearLayoutCompat>
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
+                tools:text="@string/network_user" />
         </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 0e81436a7..79c5db2e1 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -123,8 +123,8 @@
     <string name="language_french">Français</string>
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
-    <string name="login_description">Hyödynnä Ruuvi-pilvipalvelun mahdollisuudet! Kirjaudu sisään tai luo uusi Ruuvi-käyttäjätili antamalla sähköpostiosoitteesi.</string>
-    <string name="login_to_ruuvi_network">Kirjaudu\nRuuvi\ncloudiin</string>
+    <string name="login_description">Hyödyntääksesi kaikkia sovelluksen ominaisuuksia, kirjaudu sisään tai luo uusi ilmainen Ruuvi-käyttäjätili antamalla sähköpostiosoitteesi.</string>
+    <string name="login_to_ruuvi_network">Kirjaudu\nRuuvi\nStationiin</string>
     <string name="mac_address">MAC-osoite</string>
     <string name="mac_copied">MAC-osoite kopioitu leikepöydälle</string>
     <string name="measurement_sequence_number">Mittausjärjestysnumero</string>
@@ -141,14 +141,14 @@
     <string name="navigation_drawer_close">Sulje siirtymisvalikko</string>
     <string name="navigation_drawer_open">Avaa siirtymisvalikko</string>
     <string name="network_sharing_disabled">Voit jakaa vain Ruuvi Gateway -reitittimen läheisyydessä olevia antureita. Lisätietoja reitittimestä osoitteesta ruuvi.com</string>
-    <string name="network_status_title">Ruuvi cloudin tila</string>
+    <string name="network_status_title">Ruuvin pilven tila</string>
     <string name="network_sync_result_exception">Synkronointi epäonnistui: %1$s</string>
     <string name="network_sync_result_not_logged">Synkronointi epäonnistui: kirjaudu ensin</string>
     <string name="network_sync_result_success">Synkronointi onnistui!</string>
     <string name="network_synced">Synkronoitu: %1$s</string>
-    <string name="network_syncing">Synkronoidaan…</string>
+    <string name="network_syncing">Synkronoidaan...</string>
     <string name="network_user">Käyttäjä: %1$s</string>
-    <string name="never">koskaan</string>
+    <string name="never">ei koskaan</string>
     <string name="no">Ei</string>
     <string name="no_new_data_points">Uusia mittaustietoja ei saatavilla</string>
     <string name="none">ei kirjautunut</string>
@@ -240,7 +240,7 @@
     <string name="share_sensor_unshare_confirm">Haluatko lopettaa anturin jakamisen käyttäjälle %1$s?</string>
     <string name="sign_in">Kirjaudu sisään</string>
     <string name="sign_in_benefits_description">Sinut merkitään lähelläsi olevien Ruuvi-anturien omistajaksi sisäänkirjautumisen yhteydessä. Kaikki omistajan vaatimat anturit palautetaan verkosta sovelluksen uudelleenasennuksen yhteydessä.\n\nRuuvi Gatewayn avulla voit tarkastella omistamiasi antureita etänä ja jakaa niitä ystävillesi verkossa.</string>
-    <string name="sign_in_benefits_title">Ruuvi Networkin etuja</string>
+    <string name="sign_in_benefits_title">Ruuvin pilvipalvelun etuja</string>
     <string name="sign_in_check_email">Tarkasta aktivointikoodi saamastasi sähköpostista.</string>
     <string name="sign_in_code_hint">Koodi</string>
     <string name="sign_in_email_sent">Sähköposti lähetetty</string>
@@ -263,7 +263,7 @@
     <string name="synchronizing">Synkronoidaan</string>
     <string name="tag_name">Anturin nimi</string>
     <string name="tag_not_in_range">Anturia ei löydetty. Onko laite lähettyvillä?</string>
-    <string name="tagsettings_claim_button">Vahvista</string>
+    <string name="tagsettings_claim_button">Vahvista omistajuus</string>
     <string name="tagsettings_network_info">VERKON TIEDOT</string>
     <string name="tagsettings_owner">Omistaja</string>
     <string name="tagsettings_sensor_remove">Poista</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index d6c985bcb..3943fc6bf 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -119,8 +119,8 @@
     <string name="language_french">Français</string>
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
-    <string name="login_description">Profitez de tous les avantages du Ruuvi Network ! Connectez-vous ou créez votre compte en entrant votre adresse mail.</string>
-    <string name="login_to_ruuvi_network">Connexion \nRuuvi\nNetwork</string>
+    <string name="login_description">Profitez de tous les avantages du Ruuvi Station! Connectez-vous ou créez votre compte en entrant votre adresse mail.</string>
+    <string name="login_to_ruuvi_network">Connexion \nRuuvi\nStation</string>
     <string name="mac_address">Adresse MAC</string>
     <string name="mac_copied">Adreesse MAC copiée dans le presse-papiers</string>
     <string name="measurement_sequence_number">Numéro de séquence</string>
@@ -137,7 +137,6 @@
     <string name="navigation_drawer_close">Fermer le menu</string>
     <string name="navigation_drawer_open">Ouvrir le menu</string>
     <string name="network_sharing_disabled">Vous pouvez partager seulement des capteurs à proximité du Ruuvi Gateway. Plus d\'infos sur ruuvi.com</string>
-    <string name="network_status_title">Statut du Ruuvi Network</string>
     <string name="network_sync_result_exception">Echec de la synchronisation : %1$s</string>
     <string name="network_sync_result_not_logged">Echec de la synchronisation : veuillez vous connecter</string>
     <string name="network_sync_result_success">Synchronisation réussie!</string>
@@ -225,13 +224,11 @@
     <string name="share">Partager</string>
     <string name="share_sensor_add_friend">Ajouter un ami</string>
     <string name="share_sensor_already_shared">Le capteur est déjà partagé</string>
-    <string name="share_sensor_description">Pour partager votre capteur, veuillez ajouter l\'adresse mail des destinataires (maximum 10).</string>
     <string name="share_sensor_send_button">Envoyer</string>
     <string name="share_sensor_title">Partager le capteur</string>
     <string name="share_sensor_unshare_confirm">Voulez-vous arrêter le partage du capteur avec %1$s ?</string>
     <string name="sign_in">Connexion</string>
     <string name="sign_in_benefits_description">Après la connexion, vous serez automatiquement propriétaire des RuuviTags à proximité. Les capteurs couplés seront réinitialisés si vous réinstallez l\'application.\n\ Avec un routeur Ruuvi Gateway vous pourrez contrôlez vos capteurs à distance et partager vos données avec vos amis.</string>
-    <string name="sign_in_benefits_title">Avantages du Ruuvi Network</string>
     <string name="sign_in_check_email">Le code d\'activation vous a été envoyé par mail.</string>
     <string name="sign_in_code_hint">Code</string>
     <string name="sign_in_email_sent">Email envoyé</string>
@@ -240,7 +237,6 @@
     <string name="sign_in_request_code">Obtenir un code</string>
     <string name="sign_in_submit_button">Envoyer</string>
     <string name="sign_out">Déconnexion</string>
-    <string name="sign_out_confirm">Souhaitez-vous vous déconnecter ?</string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">dBm</string>
@@ -252,7 +248,6 @@
     <string name="synchronizing">Synchronisation</string>
     <string name="tag_name">Nom du capteur</string>
     <string name="tag_not_in_range">Capteur introuvable. Le capteur est-il à proximité ?</string>
-    <string name="tagsettings_claim_button">Coupler</string>
     <string name="tagsettings_network_info">RÉSEAU</string>
     <string name="tagsettings_owner">Propriétaire</string>
     <string name="tagsettings_sensor_remove">Supprimer le capteur</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 1bb25d772..2a3b9ce5d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -120,8 +120,9 @@
     <string name="language_french">Français</string>
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
+    <string name="logged_in">Пользователь:</string>
     <string name="login_description">Чтобы воспользоваться всеми функциями, создайте аккаунт или войдите в существующий. Пожалуйста, введите ваш email.</string>
-    <string name="login_to_ruuvi_network">Войти в\nRuuvi\ncloud</string>
+    <string name="login_to_ruuvi_network">Войти в\nRuuvi\nStation</string>
     <string name="mac_address">MAC адрес</string>
     <string name="mac_copied">MAC адрес скопирован в буфер обмена</string>
     <string name="measurement_sequence_number">Порядковый Номер Измерения</string>
@@ -143,7 +144,7 @@
     <string name="network_sync_result_not_logged">Ошибка синхронизации: необходимо залогиниться вначале</string>
     <string name="network_sync_result_success">Синхронизировано успешно!</string>
     <string name="network_synced">Синхронизировано: %1$s</string>
-    <string name="network_syncing">Синхронизация…</string>
+    <string name="network_syncing">Синхронизация...</string>
     <string name="network_user">Пользователь: %1$s</string>
     <string name="never">никогда</string>
     <string name="no">Нет</string>
@@ -227,13 +228,11 @@
     <string name="share">Поделиться</string>
     <string name="share_sensor_add_friend">Добавить друга</string>
     <string name="share_sensor_already_shared">Поделились</string>
-    <string name="share_sensor_description">Поделитесь показаниями своего датчика. Добавьте адреса своих друзей (10 максимум)</string>
     <string name="share_sensor_send_button">Отправить</string>
     <string name="share_sensor_title">Поделиться датчиком Ruuvi</string>
     <string name="share_sensor_unshare_confirm">Хотите перестать делиться показаниями датчика с %1$s?</string>
     <string name="sign_in">Войти</string>
     <string name="sign_in_benefits_description">После входа в систему вы будете автоматически отмечены как владелец ближайших сенсоров Ruuvi. Заявленные сенсоры будут восстановлены после повторной установки приложения.\n\nС помощью Ruuvi Gateway вы сможете удаленно контролировать заявленные сенсоры и делиться ими со своими друзьями.</string>
-    <string name="sign_in_benefits_title">Преимущества Ruuvi Network</string>
     <string name="sign_in_check_email">Пожалуйста, проверьте email для дальнейших инструкций</string>
     <string name="sign_in_code_hint">Код для входа</string>
     <string name="sign_in_email_sent">Email отправлен</string>
@@ -242,7 +241,6 @@
     <string name="sign_in_request_code">Запросить код</string>
     <string name="sign_in_submit_button">Отправить</string>
     <string name="sign_out">Выйти из сети</string>
-    <string name="sign_out_confirm">Хотите выйти из сети?</string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">дБм</string>
@@ -255,7 +253,6 @@
     <string name="synchronizing">Обмениваюсь</string>
     <string name="tag_name">Имя</string>
     <string name="tag_not_in_range">Датчик не найден</string>
-    <string name="tagsettings_claim_button">Мой сенсор</string>
     <string name="tagsettings_network_info">Данные сети</string>
     <string name="tagsettings_owner">Владелец</string>
     <string name="tagsettings_sensor_remove">Удалить сенсор</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 0d9689e61..b5bdc26ca 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -119,8 +119,8 @@
     <string name="language_french">Français</string>
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
-    <string name="login_description">Dra full nytta av Ruuvi Network! Logga in eller skapa ett nytt Ruuvi-konto genom att ange din e-postadress.</string>
-    <string name="login_to_ruuvi_network">Logga in till\nRuuvi\nNetwork</string>
+    <string name="login_description">Dra full nytta av Ruuvi Station! Logga in eller skapa ett nytt Ruuvi-konto genom att ange din e-postadress.</string>
+    <string name="login_to_ruuvi_network">Logga in till\nRuuvi\nStation</string>
     <string name="mac_address">MAC Adress</string>
     <string name="mac_copied">MAC-adressen kopierad till urklippet</string>
     <string name="measurement_sequence_number">Mätningssekvensnummer</string>
@@ -137,12 +137,11 @@
     <string name="navigation_drawer_close">Stäng navigationslådan</string>
     <string name="navigation_drawer_open">Öppna navigationslådan</string>
     <string name="network_sharing_disabled">Endast sensorer inom räckhåll av din Ruuvi Gateway kan delas. Mer information finns på ruuvi.com</string>
-    <string name="network_status_title">Ruuvi Network status</string>
     <string name="network_sync_result_exception">Synkroniseringen misslyckades: %1$s</string>
     <string name="network_sync_result_not_logged">Synkroniseringen misslyckades: du måste vara inloggad</string>
     <string name="network_sync_result_success">Synkroniseringen lyckades!</string>
     <string name="network_synced">Synkroniserat: %1$s</string>
-    <string name="network_syncing">Synkroniserar</string>
+    <string name="network_syncing">Synkroniserar...</string>
     <string name="network_user">Användare: %1$s</string>
     <string name="never">aldrig</string>
     <string name="no">Nej</string>
@@ -225,13 +224,11 @@
     <string name="share">Dela</string>
     <string name="share_sensor_add_friend">Lägg till vän</string>
     <string name="share_sensor_already_shared">Sensorn är redan delad</string>
-    <string name="share_sensor_description">Dela din Ruuvi sensor. Lägg till dina vänners e-postadresser (max 10).</string>
     <string name="share_sensor_send_button">Skicka</string>
     <string name="share_sensor_title">Dela sensor</string>
     <string name="share_sensor_unshare_confirm">Vill du sluta dela sensorn med %1$s?</string>
     <string name="sign_in">Logga in</string>
     <string name="sign_in_benefits_description">Efter inloggning markeras du automatiskt som ägare till dina närliggande Ruuvi-sensorer. Sensorernas ägare kommer att återställas om appen installerats om igen.\n\nMed en Ruuvi Gateway kan du övervaka dina sensorer på distans och dele dem med dina vänner.</string>
-    <string name="sign_in_benefits_title">Fördelar med Ruuvi Network</string>
     <string name="sign_in_check_email">Kontrollera din e-post efter en aktiveringskod.</string>
     <string name="sign_in_code_hint">Kod</string>
     <string name="sign_in_email_sent">E-post skickat</string>
@@ -240,7 +237,6 @@
     <string name="sign_in_request_code">Begär en inloggningskod</string>
     <string name="sign_in_submit_button">Skicka</string>
     <string name="sign_out">Logga ut</string>
-    <string name="sign_out_confirm">Vill du logga ut?</string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">dBm</string>
@@ -252,7 +248,6 @@
     <string name="synchronizing">Synkroniserar</string>
     <string name="tag_name">Sensornamn</string>
     <string name="tag_not_in_range">Sensorn hittades inte, är den innom räckvidd?</string>
-    <string name="tagsettings_claim_button">Bli ägare</string>
     <string name="tagsettings_network_info">NÄTVERKSINFO</string>
     <string name="tagsettings_owner">Ägare</string>
     <string name="tagsettings_sensor_remove">Ta bort sensor</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 93f45a116..7fccbd3b3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -124,8 +124,9 @@
     <string name="language_french">Français</string>
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
-    <string name="login_description">To enjoy all the features, create an account or login to your existing Ruuvi account by entering your email address.</string>
-    <string name="login_to_ruuvi_network">Login to\nRuuvi\ncloud</string>
+    <string name="logged_in">Logged in:</string>
+    <string name="login_description">To enjoy all the features, create a free account or login to your existing Ruuvi account by entering your email address.</string>
+    <string name="login_to_ruuvi_network">Login to\nRuuvi\nStation</string>
     <string name="mac_address">MAC Address</string>
     <string name="mac_copied">MAC address copied to clipboard</string>
     <string name="measurement_sequence_number">Measurement Sequence Number</string>
@@ -143,11 +144,11 @@
     <string name="navigation_drawer_open">Open the navigation drawer</string>
     <string name="network_sharing_disabled">Only sensors within range of your Ruuvi Gateway can be shared. If you don\'t have one, get it on ruuvi.com</string>
     <string name="network_status_title">Ruuvi cloud status</string>
-    <string name="network_sync_result_exception">Synchronization failed: %1$s</string>
-    <string name="network_sync_result_not_logged">Synchronization failed: need to log in first</string>
-    <string name="network_sync_result_success">Synchronized successfully!</string>
-    <string name="network_synced">Synchronized: %1$s</string>
-    <string name="network_syncing">Syncing…</string>
+    <string name="network_sync_result_exception">Synchronisation failed: %1$s</string>
+    <string name="network_sync_result_not_logged">Synchronisation failed: need to log in first</string>
+    <string name="network_sync_result_success">Synchronised successfully!</string>
+    <string name="network_synced">Synchronised: %1$s</string>
+    <string name="network_syncing">Syncing...</string>
     <string name="network_user">User: %1$s</string>
     <string name="never">never</string>
     <string name="no">No</string>
@@ -193,7 +194,7 @@
     <string name="sensor_shared">Shared</string>
     <string name="settings">Settings</string>
     <string name="settings_background_battery_optimization">If you experience any issues with background scanning you should disable battery optimization for Ruuvi Station. This procedure may vary depending on your device vendor, model and Android version.</string>
-    <string name="settings_background_battery_optimization_common_instructions">Go to Android Settings -> Apps -> Ruuvi Station -> Battery -> Battery Optimization and select Don\'t Optimize for Ruuvi Station</string>
+    <string name="settings_background_battery_optimization_common_instructions">Go to Android Settings -> Apps -> Ruuvi Station -> Battery -> Battery Optimization and select Don\'t Optimise for Ruuvi Station</string>
     <string name="settings_background_battery_optimization_huawei_instructions">On Huawei devices go to Android Settings -> Apps -> Ruuvi Station -> Power usage details -> App launch. Disable Manage Automatically and enable options: Auto-Launch, Secondary Launch and Run in background.</string>
     <string name="settings_background_battery_optimization_samsung23_instructions">On Samsung devices go to Android Settings -> Battery -> App power saving detail and set option \'Turned off\' for Ruuvi Station.</string>
     <string name="settings_background_battery_optimization_samsung_instructions">On Samsung devices go to Android Settings -> Device Maintenance (or Device Care) -> Battery. Disable Put unused apps to sleep. Disable Auto-disable unused apps. Remove Ruuvi Station from the list of sleeping apps. Disable background restrictions for Ruuvi Station.</string>
@@ -237,11 +238,11 @@
     <string name="share_sensor_already_shared">Already shared</string>
     <string name="share_sensor_description">You can share the sensor with friends and family if it\'s in range of a Ruuvi Gateway.\n\nReceiver will be notified by email. If the receiver doesn\'t have a Ruuvi account, a free Ruuvi account will be automatically created at first log in.\n\nNote that sensor\'s custom name and background image will be shared. The name and image sync is one time and they can be customised by the receiver. Offset values (if any) will be automatically synced, and the receiver will always see the corrected values.</string>
     <string name="share_sensor_send_button">Send</string>
-    <string name="share_sensor_title">Share Ruuvi sensor</string>
+    <string name="share_sensor_title">Share sensor</string>
     <string name="share_sensor_unshare_confirm">Do you want to unshare sensor for %1$s?</string>
     <string name="sign_in">Sign in</string>
     <string name="sign_in_benefits_description">After signing in, you will be automatically marked as an owner of your nearby Ruuvi sensors. The claimed sensors will be restored after an app re-install.\n\nWith a Ruuvi Gateway router, you\'ll be able to monitor the claimed sensors remotely and share them with your friends.</string>
-    <string name="sign_in_benefits_title">Benefits of Ruuvi Network</string>
+    <string name="sign_in_benefits_title">Benefits of the Ruuvi cloud service</string>
     <string name="sign_in_check_email">Check your email for an activation code.</string>
     <string name="sign_in_code_hint">Code</string>
     <string name="sign_in_email_sent">Email sent</string>
@@ -264,7 +265,7 @@
     <string name="synchronizing">Synchronizing</string>
     <string name="tag_name">Name</string>
     <string name="tag_not_in_range">Sensor not found, is it in range?</string>
-    <string name="tagsettings_claim_button">Claim</string>
+    <string name="tagsettings_claim_button">Claim ownership</string>
     <string name="tagsettings_network_info">NETWORK INFO</string>
     <string name="tagsettings_owner">Owner</string>
     <string name="tagsettings_sensor_remove">Remove sensor</string>

From 7afd90624a01bcc1b29a746d8b42e7d68614f29f Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 1 Sep 2021 23:29:01 +0300
Subject: [PATCH 06/33] version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9ff2c367f..20b79f314 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15034
-        versionName "1.5.34"
+        versionCode 15035
+        versionName "1.5.35"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

From 23b4ee32071b2c3394ba0dd55a3c5973ef6b6d3a Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Thu, 2 Sep 2021 23:39:28 +0300
Subject: [PATCH 07/33] ISSUE #443 Remove sensor automatically from the app if
 owner cancelled sharing

---
 .../data/response/RuuviNetworkResponse.kt     |  3 +-
 .../domain/NetworkDataSyncInteractor.kt       |  7 ++
 .../network/domain/RuuviNetworkInteractor.kt  |  2 +-
 .../network/domain/RuuviNetworkRepository.kt  |  4 +-
 app/src/main/res/values-fi/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           | 76 +++++++++----------
 6 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/ruuvi/station/network/data/response/RuuviNetworkResponse.kt b/app/src/main/java/com/ruuvi/station/network/data/response/RuuviNetworkResponse.kt
index 8ceca2923..da2b90792 100644
--- a/app/src/main/java/com/ruuvi/station/network/data/response/RuuviNetworkResponse.kt
+++ b/app/src/main/java/com/ruuvi/station/network/data/response/RuuviNetworkResponse.kt
@@ -3,7 +3,8 @@ package com.ruuvi.station.network.data.response
 data class RuuviNetworkResponse<T> (
     val result: String,
     val error: String,
-    val data: T?
+    val data: T?,
+    val code: String?
 ) {
     fun isSuccess() = result == successResult
 
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
index c163b64ec..4675f6240 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
@@ -249,6 +249,13 @@ class NetworkDataSyncInteractor (
                 setSensorImage(sensor, sensorSettings)
             }
         }
+
+        val sensors = sensorSettingsRepository.getSensorSettings()
+        for (sensor in sensors) {
+            if (sensor.networkSensor && userInfoData.sensors.none { it.sensor == sensor.id }) {
+                tagRepository.deleteSensorAndRelatives(sensor.id)
+            }
+        }
     }
 
     private suspend fun setSensorImage(sensor: SensorDataResponse, sensorSettings: SensorSettings) {
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
index 0d0861d4d..cb9acb920 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
@@ -117,7 +117,7 @@ class RuuviNetworkInteractor (
                     }
                 } catch (e: Exception) {
                     withContext(Dispatchers.Main) {
-                        onResult(ClaimSensorResponse(RuuviNetworkResponse.errorResult, e.message.toString(), null))
+                        onResult(ClaimSensorResponse(RuuviNetworkResponse.errorResult, e.message.toString(), null, null))
                     }
                 }
             }
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkRepository.kt b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkRepository.kt
index c3fa038be..5f2694749 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkRepository.kt
@@ -59,7 +59,7 @@ class RuuviNetworkRepository
                     result = errorResponse
                 }
             } catch (e: Exception) {
-                result = UserRegisterResponse(result = RuuviNetworkResponse.errorResult, error = e.message.orEmpty(), data = null)
+                result = UserRegisterResponse(result = RuuviNetworkResponse.errorResult, error = e.message.orEmpty(), data = null, code = null)
             }
 
             withContext(Dispatchers.Main) {
@@ -81,7 +81,7 @@ class RuuviNetworkRepository
                     result = errorResponse
                 }
             } catch (e: Exception) {
-                result = UserVerifyResponse(result = RuuviNetworkResponse.errorResult, error = e.message.orEmpty(), data = null)
+                result = UserVerifyResponse(result = RuuviNetworkResponse.errorResult, error = e.message.orEmpty(), data = null, code = null)
             }
             withContext(Dispatchers.Main) {
                 onResult(result)
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 79c5db2e1..3893a25ac 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -123,6 +123,7 @@
     <string name="language_french">Français</string>
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
+    <string name="logged_in">Kirjautunut:</string>
     <string name="login_description">Hyödyntääksesi kaikkia sovelluksen ominaisuuksia, kirjaudu sisään tai luo uusi ilmainen Ruuvi-käyttäjätili antamalla sähköpostiosoitteesi.</string>
     <string name="login_to_ruuvi_network">Kirjaudu\nRuuvi\nStationiin</string>
     <string name="mac_address">MAC-osoite</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7fccbd3b3..b18dcf9db 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,21 +12,21 @@
     <string name="alarm_notification_disable">Disable this alarm</string>
     <string name="alert_movement">Movement</string>
     <string name="alert_movement_description">Alert when sensor is moved</string>
-    <string name="alert_notification_humidity_high">Air Humidity too high!</string>
-    <string name="alert_notification_humidity_low">Air Humidity too low!</string>
+    <string name="alert_notification_humidity_high">Air Humidity is too high!</string>
+    <string name="alert_notification_humidity_low">Air Humidity is too low!</string>
     <string name="alert_notification_movement">Movement detected!</string>
     <string name="alert_notification_pressure_high">Air Pressure is too high!</string>
     <string name="alert_notification_pressure_low">Air Pressure is too low!</string>
-    <string name="alert_notification_rssi_high">Signal strength too high!</string>
-    <string name="alert_notification_rssi_low">Signal strength too low!</string>
-    <string name="alert_notification_temperature_high">Temperature too high!</string>
-    <string name="alert_notification_temperature_low">Temperature too low!</string>
+    <string name="alert_notification_rssi_high">Signal strength is too high!</string>
+    <string name="alert_notification_rssi_low">Signal strength is too low!</string>
+    <string name="alert_notification_temperature_high">Temperature is too high!</string>
+    <string name="alert_notification_temperature_low">Temperature is too low!</string>
     <string name="alert_subtitle_off">Off</string>
     <string name="alert_subtitle_on">Alert when less than %1$,d or more than %2$,d</string>
     <string name="alerts">ALERTS</string>
     <string name="app_name">Ruuvi Station</string>
     <string name="background_image">BACKGROUND\nIMAGE</string>
-    <string name="background_notification_message">You can disable background scanning in settings</string>
+    <string name="background_notification_message">You can disable background scanning in Settings</string>
     <string name="background_notification_scanning_every">Scanning every</string>
     <string name="battery_voltage">Battery Voltage</string>
     <string name="beta">beta</string>
@@ -38,13 +38,13 @@
     <string name="calibration_description_link">ruuvi.com/support</string>
     <string name="calibration_description_link_url">http://ruuvi.com/support</string>
     <string name="calibration_done">Calibration done!</string>
-    <string name="calibration_enter_humidity">Enter humidity value expected from sensor in current conditions (%1$s): </string>
-    <string name="calibration_enter_pressure">Enter pressure value expected from sensor in current conditions (%1$s): </string>
-    <string name="calibration_enter_temperature">Enter temperature value expected from sensor in current conditions (%1$s): </string>
+    <string name="calibration_enter_humidity">Enter the expected humidity value from sensor under current conditions (%1$s): </string>
+    <string name="calibration_enter_pressure">Enter the expected pressure value from sensor under current conditions (%1$s): </string>
+    <string name="calibration_enter_temperature">Enter the expected temperature value from sensor under current conditions (%1$s): </string>
     <string name="calibration_hint">%1$d%% -> 75%%</string>
-    <string name="calibration_humidity">In order to measure relative humidity as accurately as possible, a sodium chloride (salt) calibration is recommended. See video tutorials on how to easily do it at home.</string>
+    <string name="calibration_humidity">In order to measure relative humidity as accurately as possible, a sodium chloride (salt) calibration is recommended. See video tutorials on how to easily do this at home.</string>
     <string name="calibration_humidity_button">Calibrate hygrometer</string>
-    <string name="calibration_humidity_disclaimer">Note that calibration data will be stored locally in your mobile device. After Ruuvi Station uninstall \u0026 install, you may need to recalibrate.</string>
+    <string name="calibration_humidity_disclaimer">Note that calibration data will be stored locally in your mobile device. After Ruuvi Station uninstall and install, you may need to recalibrate.</string>
     <string name="calibration_humidity_link">video tutorials</string>
     <string name="calibration_humidity_link_url">https://www.youtube.com/results?search_query=hygrometer+salt+calibration</string>
     <string name="calibration_humidity_offset">Humidity offset</string>
@@ -58,17 +58,17 @@
     <string name="cancel">Cancel</string>
     <string name="charts_background_dialog_description">Charts feature works best with background scanning enabled.</string>
     <string name="charts_background_dialog_title_question">Would you like to enable background scanning?</string>
-    <string name="claim_description">Do you own this sensor? If yes, please claim ownership of the sensor and it\'ll be added to your Ruuvi account. Every Ruuvi sensor can have only one owner.\n\nBenefits:\n\n ● Sensor names, background images, offsets and alert settings will be securely stored in the cloud\n\n ● Access sensors remotely over the Internet (requires a Ruuvi Gateway)\n\n ● Share sensors with friends and family (requires a Ruuvi Gateway)\n\n ● Browse up to 2 years of history on station.ruuvi.com (requires a Ruuvi Gateway)</string>
+    <string name="claim_description">Do you own this sensor? If yes, please claim ownership of the sensor and it\'ll be added to your Ruuvi account. Every Ruuvi sensor can have only one owner.\n\nBenefits:\n\n ● Sensor names, background images, offsets and alert settings will be securely stored in the Cloud\n\n ● Access sensors remotely over the Internet (requires a Ruuvi Gateway)\n\n ● Share sensors with friends and family (requires a Ruuvi Gateway)\n\n ● Browse up to 2 years of history on station.ruuvi.com (requires a Ruuvi Gateway)</string>
     <string name="claim_ownership">Claim Ownership</string>
     <string name="claim_sensor">Claim sensor</string>
     <string name="clear">Clear</string>
     <string name="clear_confirm">Clear the historical data from the app?</string>
     <string name="close">Close</string>
     <string name="confirm">Confirm</string>
-    <string name="connected_reading_info">Synchronizing...</string>
+    <string name="connected_reading_info">Synchronising...</string>
     <string name="connecting">Connecting...</string>
     <string name="dashboard">Dashboard</string>
-    <string name="dashboard_description">Use dashboard view to see multiple sensors at a glance. Restart the app after enabled.</string>
+    <string name="dashboard_description">Use dashboard view to see multiple sensors at a glance. Restart the app after enabling it.</string>
     <string name="dashboard_empty">Your dashboard \nis empty</string>
     <string name="data_format">Data Format</string>
     <string name="data_forwarding_disabled">Disabled</string>
@@ -79,7 +79,7 @@
     <string name="disconnected">Disconnected</string>
     <string name="email">Email</string>
     <string name="export">EXPORT</string>
-    <string name="export_csv_chooser_title">Sensor %1$s csv export</string>
+    <string name="export_csv_chooser_title">Sensor %1$s CSV export</string>
     <string name="export_csv_created">.csv created, opening share menu</string>
     <string name="export_csv_failed">Failed to create CSV file</string>
     <string name="export_csv_header_format2_4">Timestamp,Temperature (%1$s), Humidity (%2$s), Pressure (%3$s),RSSI</string>
@@ -87,22 +87,22 @@
     <string name="export_csv_header_format5">Timestamp,Temperature (%1$s), Humidity (%2$s), Pressure (%3$s),RSSI,Acceleration X,Acceleration Y,Acceleration Z,Voltage,Movement counter,Measurement sequence number</string>
     <string name="file_not_supported">File type not supported</string>
     <string name="gallery">Gallery</string>
-    <string name="gateway_test_exception">Nope, did not work. Is the URL correct?</string>
-    <string name="gateway_test_fail">Nope, did not work. Response code: %1$d</string>
+    <string name="gateway_test_exception">Nope, it did not work. Is the URL correct?</string>
+    <string name="gateway_test_fail">Nope, it did not work. Response code: %1$d</string>
     <string name="gateway_test_success">Data forwarding works! Response code: %1$d</string>
     <string name="gateway_testing">Testing...</string>
     <string name="general">General</string>
     <string name="h">h</string>
-    <string name="help_about_text">Ruuvi Station is an easy-to-use but powerful tool to supercharge your Ruuvi sensors. Just add some sensors and you\'re ready to go.</string>
+    <string name="help_about_text">Ruuvi Station is an easy-to-use but powerful tool to supercharge your Ruuvi sensors. Simply add some sensors and you\'re ready to go.</string>
     <string name="help_about_title">ABOUT / HELP</string>
     <string name="help_added_tags">Added sensors: %1$,d</string>
     <string name="help_db_data_points">Stored measurements: %1$,d</string>
     <string name="help_db_size">Database size: %1$,d kB</string>
     <string name="help_more_to_read_text">Ruuvi\'s website: ruuvi.com\nRuuvi Forum: f.ruuvi.com\nRuuvi Blog: blog.ruuvi.com\nRuuvi on Twitter: twitter.com/ruuvicom</string>
     <string name="help_more_to_read_title">MORE TO READ</string>
-    <string name="help_opensource_text">Just like Ruuvi sensor, Ruuvi Station is also open-source: github.com/ruuvi</string>
+    <string name="help_opensource_text">Just like Ruuvi sensors, Ruuvi Station is also open-source: github.com/ruuvi</string>
     <string name="help_opensource_title">OPEN-SOURCE</string>
-    <string name="help_operations_text">We\'ve designed the app to be self-explanatory but also comprehensive manuals are available for both Ruuvi sensors and Ruuvi Station: ruuvi.com/manuals</string>
+    <string name="help_operations_text">We\'ve designed the app to be self-explanatory but comprehensive manuals are also available for both Ruuvi sensors and Ruuvi Station: ruuvi.com/manuals</string>
     <string name="help_operations_title">OPERATIONS MANUAL</string>
     <string name="help_privacy_policy_text">By using the application, you accept Ruuvi\'s standard terms and conditions\nruuvi.com/terms</string>
     <string name="help_privacy_policy_title">PRIVACY POLICY</string>
@@ -142,7 +142,7 @@
     <string name="name">NAME</string>
     <string name="navigation_drawer_close">Close the navigation drawer</string>
     <string name="navigation_drawer_open">Open the navigation drawer</string>
-    <string name="network_sharing_disabled">Only sensors within range of your Ruuvi Gateway can be shared. If you don\'t have one, get it on ruuvi.com</string>
+    <string name="network_sharing_disabled">Only sensors within range of your Ruuvi Gateway can be shared. If you don\'t have one yet, get it on ruuvi.com</string>
     <string name="network_status_title">Ruuvi cloud status</string>
     <string name="network_sync_result_exception">Synchronisation failed: %1$s</string>
     <string name="network_sync_result_not_logged">Synchronisation failed: need to log in first</string>
@@ -157,10 +157,10 @@
     <string name="offset_correction">Offset correction</string>
     <string name="ok">OK</string>
     <string name="permission_background_dialog_title">Enable Background Scanning</string>
-    <string name="permission_dialog_background_request_message">In order to scan nearby Bluetooth devices in the background, Android requires background location access to be enabled. \n\nPlease click allow all the time if you\'d like to use the background scanning feature. \n\nRuuvi doesn\'t track your movements. You\'re safe.</string>
+    <string name="permission_dialog_background_request_message">In order to scan nearby Bluetooth devices in the background, Android requires background location access to be enabled. \n\nPlease click \'allow all the time\' if you\'d like to use the background scanning feature. \n\nRuuvi doesn\'t track your movements. You\'re safe.</string>
     <string name="permission_dialog_request_message">In order to scan nearby Bluetooth devices, Android requires location access to be enabled. \n\nRuuvi doesn\'t track your movements. You\'re safe.</string>
     <string name="permission_dialog_title">Enable Bluetooth Scanning</string>
-    <string name="permission_location_needed">Please enable location permission in settings to see sensors.</string>
+    <string name="permission_location_needed">Please enable location permission in Settings to see sensors.</string>
     <string name="press_to_add">No sensors added,\npress here to add sensors</string>
     <string name="pressure">Pressure</string>
     <string name="pressure_hpa_name">Hectopascal (hPa)</string>
@@ -179,7 +179,7 @@
     <string name="remove">Remove</string>
     <string name="remove_claimed_sensor">By removing the sensor, your sensor ownership status will be revoked. After removal, someone else can claim ownership of the sensor. Every Ruuvi sensor can have only one owner.</string>
     <string name="remove_local_sensor">Do you want to remove the sensor? You can add it again later, if needed.</string>
-    <string name="remove_shared_sensor">If you remove the sensor, owner of the sensor will be notified and you cannot access the sensor anymore.</string>
+    <string name="remove_shared_sensor">If you remove the sensor, the owner of the sensor will be notified and you cannot access the sensor anymore.</string>
     <string name="remove_this_sensor">Remove this sensor</string>
     <string name="rssi">Signal strength (RSSI)</string>
     <string name="s">s</string>
@@ -194,10 +194,10 @@
     <string name="sensor_shared">Shared</string>
     <string name="settings">Settings</string>
     <string name="settings_background_battery_optimization">If you experience any issues with background scanning you should disable battery optimization for Ruuvi Station. This procedure may vary depending on your device vendor, model and Android version.</string>
-    <string name="settings_background_battery_optimization_common_instructions">Go to Android Settings -> Apps -> Ruuvi Station -> Battery -> Battery Optimization and select Don\'t Optimise for Ruuvi Station</string>
-    <string name="settings_background_battery_optimization_huawei_instructions">On Huawei devices go to Android Settings -> Apps -> Ruuvi Station -> Power usage details -> App launch. Disable Manage Automatically and enable options: Auto-Launch, Secondary Launch and Run in background.</string>
+    <string name="settings_background_battery_optimization_common_instructions">Go to Android Settings -> Apps -> Ruuvi Station -> Battery -> Battery Optimization and select \'Don\'t Optimise for Ruuvi Station\'</string>
+    <string name="settings_background_battery_optimization_huawei_instructions">On Huawei devices go to Android Settings -> Apps -> Ruuvi Station -> Power usage details -> App launch. Disable \'Manage Automatically\' and enable options: \'Auto-Launch\', \'Secondary Launch\' and \'Run in background\'.</string>
     <string name="settings_background_battery_optimization_samsung23_instructions">On Samsung devices go to Android Settings -> Battery -> App power saving detail and set option \'Turned off\' for Ruuvi Station.</string>
-    <string name="settings_background_battery_optimization_samsung_instructions">On Samsung devices go to Android Settings -> Device Maintenance (or Device Care) -> Battery. Disable Put unused apps to sleep. Disable Auto-disable unused apps. Remove Ruuvi Station from the list of sleeping apps. Disable background restrictions for Ruuvi Station.</string>
+    <string name="settings_background_battery_optimization_samsung_instructions">On Samsung devices go to Android Settings -> Device Maintenance (or Device Care) -> Battery. Disable \'Put unused apps to sleep\'. Disable \'Auto-disable unused apps\'. Remove Ruuvi Station from the list of sleeping apps. Disable background restrictions for Ruuvi Station.</string>
     <string name="settings_background_battery_optimization_title">Background scan important note</string>
     <string name="settings_background_battery_optimization_xiaomi_instructions">On Xiaomi devices go to Android Settings -> Apps -> Manage apps -> Ruuvi Station. Enable Autostart and set Battery Saver to \'No restrictions\'.</string>
     <string name="settings_background_continuous">Continuous background scanning</string>
@@ -212,13 +212,13 @@
     <string name="settings_chart">Chart Settings</string>
     <string name="settings_chart_all_points">Display all data in chart</string>
     <string name="settings_chart_all_points_description">Enabling it may cause charts to update slowly</string>
-    <string name="settings_chart_description">Configure interval between points shown on chart and history diapason</string>
+    <string name="settings_chart_description">Configure interval between points shown on chart</string>
     <string name="settings_chart_draw_dots">Draw dots in chart</string>
     <string name="settings_chart_draw_dots_description">Small dots will help to understand when measurements were collected</string>
     <string name="settings_chart_interval">Chart Interval</string>
-    <string name="settings_chart_interval_description">Set interval between points for chart from 1 to 60 minutes. Less value means more accurate chart, but higher requirements to performance of your device</string>
+    <string name="settings_chart_interval_description">Set interval between points for chart from 1 to 60 minutes. Smaller values mean a more accurate chart, but also a higher performance requirement for your device</string>
     <string name="settings_chart_view_period">Chart history view period</string>
-    <string name="settings_chart_view_period_description">Configure history diapason to be shown on chart from 1 to 10 days</string>
+    <string name="settings_chart_view_period_description">Configure the period of history to be shown on chart from 1 to 10 days</string>
     <string name="settings_data_forwarding">Data Forwarding Settings</string>
     <string name="settings_data_forwarding_test">Test data forwarding</string>
     <string name="settings_experimental">Experimental features</string>
@@ -236,33 +236,33 @@
     <string name="share">Share</string>
     <string name="share_sensor_add_friend">Add friend</string>
     <string name="share_sensor_already_shared">Already shared</string>
-    <string name="share_sensor_description">You can share the sensor with friends and family if it\'s in range of a Ruuvi Gateway.\n\nReceiver will be notified by email. If the receiver doesn\'t have a Ruuvi account, a free Ruuvi account will be automatically created at first log in.\n\nNote that sensor\'s custom name and background image will be shared. The name and image sync is one time and they can be customised by the receiver. Offset values (if any) will be automatically synced, and the receiver will always see the corrected values.</string>
+    <string name="share_sensor_description">You can share the sensor with friends and family if it\'s in range of a Ruuvi Gateway.\n\nReceiver will be notified by email. If the receiver doesn\'t have a Ruuvi account, a free Ruuvi account will automatically be created at first log in.\n\nNote that the sensor\'s custom name and background image will be shared. The name and image sync is one time only, and they can be customised by the receiver. Offset values (if any) will be automatically synced, and the receiver will always see the corrected values.</string>
     <string name="share_sensor_send_button">Send</string>
     <string name="share_sensor_title">Share sensor</string>
     <string name="share_sensor_unshare_confirm">Do you want to unshare sensor for %1$s?</string>
     <string name="sign_in">Sign in</string>
-    <string name="sign_in_benefits_description">After signing in, you will be automatically marked as an owner of your nearby Ruuvi sensors. The claimed sensors will be restored after an app re-install.\n\nWith a Ruuvi Gateway router, you\'ll be able to monitor the claimed sensors remotely and share them with your friends.</string>
-    <string name="sign_in_benefits_title">Benefits of the Ruuvi cloud service</string>
+    <string name="sign_in_benefits_description">After signing in, you will automatically be marked as the owner of your nearby Ruuvi sensors. The claimed sensors will be restored after an app re-install.\n\nWith a Ruuvi Gateway router, you\'ll be able to monitor the claimed sensors remotely and share them with your friends.</string>
+    <string name="sign_in_benefits_title">Benefits of the Ruuvi Cloud service</string>
     <string name="sign_in_check_email">Check your email for an activation code.</string>
     <string name="sign_in_code_hint">Code</string>
     <string name="sign_in_email_sent">Email sent</string>
     <string name="sign_in_login_button">Login</string>
     <string name="sign_in_manual_code">Enter code manually</string>
-    <string name="sign_in_request_code">Request a Code</string>
+    <string name="sign_in_request_code">Request a code</string>
     <string name="sign_in_submit_button">Submit</string>
     <string name="sign_out">Sign out</string>
-    <string name="sign_out_confirm">When you sign out, sensors of which ownerships you\'ve claimed on the sensor settings page, will be automatically removed from the app. When you sign in again using the same email address, the sensors will be returned from the cloud.\n\n Do you want sign out?</string>
+    <string name="sign_out_confirm">When you sign out, sensors the ownerships of which you\'ve claimed on the sensor Settings page will be automatically removed from the app. When you sign in again using the same email address, the sensors will be returned from the Cloud.\n\n Do you want to sign out?</string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">dBm</string>
     <string name="skip">SKIP</string>
     <string name="something_went_wrong">Something went wrong</string>
-    <string name="successfully_claimed">Successfully claimed ownership of the sensor</string>
+    <string name="successfully_claimed">Ownership of the sensor claimed successfully</string>
     <string name="successfully_shared">Successfully shared sensor</string>
     <string name="sync">SYNC</string>
     <string name="sync_complete">Sync complete</string>
     <string name="sync_confirm">Download history data from the sensor?</string>
-    <string name="synchronizing">Synchronizing</string>
+    <string name="synchronizing">Synchronising</string>
     <string name="tag_name">Name</string>
     <string name="tag_not_in_range">Sensor not found, is it in range?</string>
     <string name="tagsettings_claim_button">Claim ownership</string>

From cdfc51ba01033002b573542d7303e5b2a05b2cc7 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Fri, 3 Sep 2021 00:46:30 +0300
Subject: [PATCH 08/33] ISSUE #472 auto organise sensors alphabetically
 according sensor names (quick and allows user to reorganise by renaming)

---
 .../java/com/ruuvi/station/database/domain/TagRepository.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
index 1fa282ebb..4a2104dc5 100644
--- a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
@@ -8,6 +8,8 @@ import com.ruuvi.station.tag.domain.RuuviTag
 import com.ruuvi.station.tag.domain.TagConverter
 import timber.log.Timber
 import java.util.*
+import com.raizlabs.android.dbflow.annotation.Collate
+import com.raizlabs.android.dbflow.sql.language.OrderBy
 
 class TagRepository(
     private val sensorSettingsRepository: SensorSettingsRepository,
@@ -48,7 +50,7 @@ class TagRepository(
             .from(SensorSettings::class.java)
             .innerJoin(RuuviTagEntity::class.java)
             .on(SensorSettings_Table.id.withTable().eq(RuuviTagEntity_Table.id.withTable()))
-            .orderBy(SensorSettings_Table.createDate.withTable(), true)
+            .orderBy(OrderBy.fromProperty(SensorSettings_Table.name).collate(Collate.UNICODE).ascending())
             .queryCustomList(FavouriteSensorQuery::class.java)
             .map { tagConverter.fromDatabase(it) }
     }

From 25b826829730249ebbb64eb3d7817eeab7d2abb6 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Fri, 3 Sep 2021 01:07:39 +0300
Subject: [PATCH 09/33] version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 20b79f314..04d3e895d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15035
-        versionName "1.5.35"
+        versionCode 15036
+        versionName "1.5.36"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

From bd331cfa65a6d188e85c2db9b6f53ff92ea98c5f Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Fri, 3 Sep 2021 09:18:38 +0300
Subject: [PATCH 10/33] ISSUE #472 auto organise sensors alphabetically
 according sensor names (quick and allows user to reorganise by renaming)

---
 app/build.gradle                                              | 4 ++--
 .../java/com/ruuvi/station/database/domain/TagRepository.kt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 04d3e895d..c3592561b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15036
-        versionName "1.5.36"
+        versionCode 15037
+        versionName "1.5.37"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
index 4a2104dc5..03f34bba8 100644
--- a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
@@ -50,7 +50,7 @@ class TagRepository(
             .from(SensorSettings::class.java)
             .innerJoin(RuuviTagEntity::class.java)
             .on(SensorSettings_Table.id.withTable().eq(RuuviTagEntity_Table.id.withTable()))
-            .orderBy(OrderBy.fromProperty(SensorSettings_Table.name).collate(Collate.UNICODE).ascending())
+            .orderBy(OrderBy.fromProperty(SensorSettings_Table.name.withTable()).collate(Collate.UNICODE).ascending())
             .queryCustomList(FavouriteSensorQuery::class.java)
             .map { tagConverter.fromDatabase(it) }
     }

From 1817c03d47948b5a96dbb2be4897ae99abb1d109 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Fri, 3 Sep 2021 10:54:51 +0300
Subject: [PATCH 11/33] ISSUE #476 Sensors with scandic letters aren't
 organized correctly [CHANGED] collate to LOCALIZED

---
 .../java/com/ruuvi/station/database/domain/TagRepository.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
index 03f34bba8..80c3ace5f 100644
--- a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
@@ -50,7 +50,7 @@ class TagRepository(
             .from(SensorSettings::class.java)
             .innerJoin(RuuviTagEntity::class.java)
             .on(SensorSettings_Table.id.withTable().eq(RuuviTagEntity_Table.id.withTable()))
-            .orderBy(OrderBy.fromProperty(SensorSettings_Table.name.withTable()).collate(Collate.UNICODE).ascending())
+            .orderBy(OrderBy.fromProperty(SensorSettings_Table.name.withTable()).collate(Collate.LOCALIZED).ascending())
             .queryCustomList(FavouriteSensorQuery::class.java)
             .map { tagConverter.fromDatabase(it) }
     }

From d0a2128ff8db5cd711223f7238da341f5bb7b166 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Tue, 7 Sep 2021 18:06:56 +0300
Subject: [PATCH 12/33] ISSUE #475 Shared sensor is "returned" should owners
 shared list be updated? [FIXED] unsharing

---
 app/build.gradle                                |  4 ++--
 .../network/domain/NetworkDataSyncInteractor.kt | 15 +++++++++------
 .../tagsettings/domain/TagSettingsInteractor.kt |  2 +-
 app/src/main/res/values-sv/strings.xml          | 17 +++++++++++++++++
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c3592561b..702129272 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15037
-        versionName "1.5.37"
+        versionCode 15038
+        versionName "1.5.38"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
index 4675f6240..167374e43 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
@@ -7,7 +7,6 @@ import com.ruuvi.station.bluetooth.BluetoothLibrary
 import com.ruuvi.station.database.domain.SensorHistoryRepository
 import com.ruuvi.station.database.domain.SensorSettingsRepository
 import com.ruuvi.station.database.domain.TagRepository
-import com.ruuvi.station.database.tables.RuuviTagEntity
 import com.ruuvi.station.database.tables.SensorSettings
 import com.ruuvi.station.database.tables.TagSensorReading
 import com.ruuvi.station.image.ImageInteractor
@@ -60,13 +59,17 @@ class NetworkDataSyncInteractor (
         }
 
         autoRefreshJob = CoroutineScope(IO).launch {
+            syncNetworkData()
+            delay(10000)
             while (true) {
-                Timber.d("Cloud auto refresh another round")
+                val lastSync = preferencesRepository.getLastSyncDate()
+                Timber.d("Cloud auto refresh another round. Last sync ${Date(lastSync)}")
                 if (networkInteractor.signedIn &&
-                    Date(preferencesRepository.getLastSyncDate()).diffGreaterThan(60*1000)) {
+                    Date(lastSync).diffGreaterThan(60000)) {
+                        Timber.d("Do actual sync")
                     syncNetworkData()
                 }
-                delay(65 * 1000)
+                delay(10000)
             }
         }
     }
@@ -97,7 +100,7 @@ class NetworkDataSyncInteractor (
                 }
 
                 val benchUpdate1 = Date()
-                updateTags(userInfo.data)
+                updateSensors(userInfo.data)
                 val benchUpdate2 = Date()
                 Timber.d("benchmark-updateTags-finish - ${benchUpdate2.time - benchUpdate1.time} ms")
                 Timber.d("benchmark-syncForPeriod-start")
@@ -239,7 +242,7 @@ class NetworkDataSyncInteractor (
         return 0
     }
 
-    private suspend fun updateTags(userInfoData: UserInfoResponseBody) {
+    private suspend fun updateSensors(userInfoData: UserInfoResponseBody) {
         userInfoData.sensors.forEach { sensor ->
             Timber.d("updateTags: $sensor")
             val sensorSettings = sensorSettingsRepository.getSensorSettingsOrCreate(sensor.sensor)
diff --git a/app/src/main/java/com/ruuvi/station/tagsettings/domain/TagSettingsInteractor.kt b/app/src/main/java/com/ruuvi/station/tagsettings/domain/TagSettingsInteractor.kt
index 312e4fd89..5b7ff6669 100644
--- a/app/src/main/java/com/ruuvi/station/tagsettings/domain/TagSettingsInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/tagsettings/domain/TagSettingsInteractor.kt
@@ -32,7 +32,7 @@ class TagSettingsInteractor(
             if (sensorSettings.owner == networkInteractor.getEmail()) {
                 networkInteractor.unclaimSensor(sensorId)
             } else {
-                networkInteractor.unshareSensor(owner, sensorId)
+                networkInteractor.unshareSensor(networkInteractor.getEmail() ?: "", sensorId)
             }
         }
     }
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b5bdc26ca..80951eae2 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -57,6 +57,9 @@
     <string name="cancel">Avbryt</string>
     <string name="charts_background_dialog_description">Historiken fungerar bäst när bakgrundsskanning är aktiverad.</string>
     <string name="charts_background_dialog_title_question">Vill du aktivera bakgrundsskanning?</string>
+    <string name="claim_description">Äger du den här sensorn? Bekräfta ägandet och så läggs sensorn till på ditt Ruuvi-konto. Varje Ruuvi-sensor kan bara ha en ägare.\n\nFördelar:\n\n ● Sensornamn, bakgrundsbilder, kalibrering och larminformation från en säker molntjänst\n\n ● Läs sensorinformation på distans online ( kräver Ruuvi Gateway-router)\n\n ● Dela sensorer med vänner och familj (kräver Ruuvi Gateway)\n\n ● Upp till 2 års historik från station.ruuvi.com (kräver Ruuvi Gateway)</string>
+    <string name="claim_ownership">Bekräfta Ägandet</string>
+    <string name="claim_sensor">Bekräfta ägandet</string>
     <string name="clear">Rensa</string>
     <string name="clear_confirm">Radera historisk data från appen?</string>
     <string name="close">Stäng</string>
@@ -87,6 +90,7 @@
     <string name="gateway_test_fail">Fel uppstod. HTTP svarskod: %1$d</string>
     <string name="gateway_test_success">Proxyn fungerar! HTTP svarskod: %1$d</string>
     <string name="gateway_testing">Testar...</string>
+    <string name="general">Allmänt</string>
     <string name="h">h</string>
     <string name="help_about_text">Ruuvi State är en lättanvänt och kraftfullt program för Ruuvi sensorer. Sätt igång genom att lägga till sensorer.</string>
     <string name="help_about_title">OM / HJÄLP</string>
@@ -119,6 +123,7 @@
     <string name="language_french">Français</string>
     <string name="language_russian">Русский</string>
     <string name="language_swedish">Svenska</string>
+    <string name="logged_in">Inloggad:</string>
     <string name="login_description">Dra full nytta av Ruuvi Station! Logga in eller skapa ett nytt Ruuvi-konto genom att ange din e-postadress.</string>
     <string name="login_to_ruuvi_network">Logga in till\nRuuvi\nStation</string>
     <string name="mac_address">MAC Adress</string>
@@ -137,6 +142,7 @@
     <string name="navigation_drawer_close">Stäng navigationslådan</string>
     <string name="navigation_drawer_open">Öppna navigationslådan</string>
     <string name="network_sharing_disabled">Endast sensorer inom räckhåll av din Ruuvi Gateway kan delas. Mer information finns på ruuvi.com</string>
+    <string name="network_status_title">Ruuvi cloud status</string>
     <string name="network_sync_result_exception">Synkroniseringen misslyckades: %1$s</string>
     <string name="network_sync_result_not_logged">Synkroniseringen misslyckades: du måste vara inloggad</string>
     <string name="network_sync_result_success">Synkroniseringen lyckades!</string>
@@ -170,7 +176,10 @@
     <string name="reading_history">Läser historik</string>
     <string name="reading_history_not_supported">Firmware versionen stöds inte</string>
     <string name="remove">Ta bort</string>
+    <string name="remove_claimed_sensor">Om du tar bort sensorn upphör ägarskapet. Vem som helst kan göra anspråk på ägandet av sensorn efter borttagning. Varje Ruuvi-sensor kan bara ha en ägare.</string>
     <string name="remove_local_sensor">Är du säker på att du vill ta bort den här sensorn?</string>
+    <string name="remove_shared_sensor">Om du tar bort sensorn så meddelas ägaren till sensorn och du kan inte komma åt den längre.</string>
+    <string name="remove_this_sensor">Ta bort sensorn</string>
     <string name="rssi">Signalstyrka (RSSI)</string>
     <string name="s">s</string>
     <string name="scan">SKANNA</string>
@@ -179,7 +188,9 @@
     <string name="select_picture">Välj bild</string>
     <string name="send_email">Skicka e-post</string>
     <string name="sensor_already_added">Sensorn har redan lagts till</string>
+    <string name="sensor_not_shared">Inte delad</string>
     <string name="sensor_settings">Sensorinställningar</string>
+    <string name="sensor_shared">Delad</string>
     <string name="settings">Inställningar</string>
     <string name="settings_background_battery_optimization">Om du har problem med bakgrundsskanningen så kan det hjälpa att stänga av batterioptimering. Denna inställning hittas på olika ställen beroende på telefonens tillverkare, modell och Android version.</string>
     <string name="settings_background_battery_optimization_common_instructions">Gå till operativsystemets Inställningar -> Appar -> Batteri -> Batterioptimering och välj Optimera inte för Ruuvi Station</string>
@@ -224,11 +235,13 @@
     <string name="share">Dela</string>
     <string name="share_sensor_add_friend">Lägg till vän</string>
     <string name="share_sensor_already_shared">Sensorn är redan delad</string>
+    <string name="share_sensor_description">Du kan dela sensorn med vänner och familj om den är inom räckhåll för en Ruuvi Gateway.\n\nMottagaren meddelas via e-post. Om mottagaren inte har ett Ruuvi-konto skapas ett gratis Ruuvi-konto automatiskt vid första inloggningen.\n\nObservera att sensorns anpassade namn och bakgrundsbild delas. Namnet och bildsynkroniseringen sker endast vid en gång, efteråt kan det anpassas av mottagaren. Kalibreringsvärden (om sådana finns) synkroniseras automatiskt och mottagaren ser alltid de korrigerade värdena.</string>
     <string name="share_sensor_send_button">Skicka</string>
     <string name="share_sensor_title">Dela sensor</string>
     <string name="share_sensor_unshare_confirm">Vill du sluta dela sensorn med %1$s?</string>
     <string name="sign_in">Logga in</string>
     <string name="sign_in_benefits_description">Efter inloggning markeras du automatiskt som ägare till dina närliggande Ruuvi-sensorer. Sensorernas ägare kommer att återställas om appen installerats om igen.\n\nMed en Ruuvi Gateway kan du övervaka dina sensorer på distans och dele dem med dina vänner.</string>
+    <string name="sign_in_benefits_title">Fördelarna med Ruuvi Cloud</string>
     <string name="sign_in_check_email">Kontrollera din e-post efter en aktiveringskod.</string>
     <string name="sign_in_code_hint">Kod</string>
     <string name="sign_in_email_sent">E-post skickat</string>
@@ -237,17 +250,21 @@
     <string name="sign_in_request_code">Begär en inloggningskod</string>
     <string name="sign_in_submit_button">Skicka</string>
     <string name="sign_out">Logga ut</string>
+    <string name="sign_out_confirm">Sensorer som du har verifierat äganderätten till på inställningssidan tas automatiskt bort från appen när du loggar ut. Sensordata hämtas från molnet igen om du loggar in med samma e-postadress.\n\n Är du säker på att du vill logga ut? </string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">dBm</string>
     <string name="skip">SKIPPA</string>
     <string name="something_went_wrong">Något gick fel</string>
+    <string name="successfully_claimed">Sensorägande bekräftat</string>
+    <string name="successfully_shared">Delningen lyckades</string>
     <string name="sync">SYNK</string>
     <string name="sync_complete">Synkronisering klar</string>
     <string name="sync_confirm">Ladda ner historik-data från sensorn?</string>
     <string name="synchronizing">Synkroniserar</string>
     <string name="tag_name">Sensornamn</string>
     <string name="tag_not_in_range">Sensorn hittades inte, är den innom räckvidd?</string>
+    <string name="tagsettings_claim_button">Bekräfta ägandet</string>
     <string name="tagsettings_network_info">NÄTVERKSINFO</string>
     <string name="tagsettings_owner">Ägare</string>
     <string name="tagsettings_sensor_remove">Ta bort sensor</string>

From 05c4837868f17b5da50b48adcf0afaf4267a80a6 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 8 Sep 2021 20:03:47 +0300
Subject: [PATCH 13/33] ISSUE #472 auto organise sensors alphabetically
 according sensor names (quick and allows user to reorganise by renaming)
 [FIXED] select new sensor after adding [ADDED] message to add sensor dialog

---
 .../tagdetails/ui/TagDetailsActivity.kt       | 20 +++++++++++--------
 .../tagsettings/ui/SensorNameEditDialog.kt    |  1 +
 app/src/main/res/values-ru/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
index a20a1c251..e3cfbe4a7 100644
--- a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
@@ -213,21 +213,23 @@ class TagDetailsActivity : AppCompatActivity(), KodeinAware {
     }
 
     private fun setupTags(tags: List<RuuviTag>) {
-        val previousTagsSize = adapter.count
+        val newSensorId = getNewSensor(adapter.getTags(), tags)
+        Timber.d("newSensorId = $newSensorId desiredTag = ${viewModel.desiredTag}")
+        if (newSensorId != null) viewModel.desiredTag = newSensorId
         adapter.setTags(tags)
 
-        val isSizeChanged = previousTagsSize > 0 && tags.size != previousTagsSize
         setupVisibility(tags.isNullOrEmpty())
         if (tags.isNotEmpty()) {
-            if (!viewModel.desiredTag.isNullOrEmpty() && !isSizeChanged) {
-                val index = tags.indexOfFirst { tag -> tag.id == viewModel.desiredTag }
-                scrollOrCacheCurrentPosition(tagPager.currentItem != index, index)
-            } else {
-                scrollOrCacheCurrentPosition(isSizeChanged, tags.size - 1)
-            }
+            val index = tags.indexOfFirst { tag -> tag.id == viewModel.desiredTag }
+            scrollOrCacheCurrentPosition(tagPager.currentItem != index, index)
         }
     }
 
+    private fun getNewSensor(previousSensors: List<RuuviTag>, newSensors: List<RuuviTag>): String? {
+        if (previousSensors.isNullOrEmpty()) return null
+        return newSensors.firstOrNull { newSens -> previousSensors.none { it.id == newSens.id } }?.id
+    }
+
     private fun scrollOrCacheCurrentPosition(shouldScroll: Boolean, scrollToPosition: Int) {
         if (shouldScroll) {
             tagPager.setCurrentItem(scrollToPosition, false)
@@ -502,6 +504,8 @@ class TagDetailsActivity : AppCompatActivity(), KodeinAware {
             this.tags = tags
             notifyDataSetChanged()
         }
+
+        fun getTags() = tags
     }
 
     private fun requestPermission() {
diff --git a/app/src/main/java/com/ruuvi/station/tagsettings/ui/SensorNameEditDialog.kt b/app/src/main/java/com/ruuvi/station/tagsettings/ui/SensorNameEditDialog.kt
index 65d43ad0a..45467a0cd 100644
--- a/app/src/main/java/com/ruuvi/station/tagsettings/ui/SensorNameEditDialog.kt
+++ b/app/src/main/java/com/ruuvi/station/tagsettings/ui/SensorNameEditDialog.kt
@@ -26,6 +26,7 @@ class SensorNameEditDialog(
             builder
                 .setView(binding.root)
                 .setTitle(getString(R.string.tag_name))
+                .setMessage(R.string.rename_sensor_message)
                 .setPositiveButton(R.string.ok) {_,_->
                     var value: String? = binding.sensorNameEditText.text.toString()
                     if (value.isNullOrEmpty()) value = null
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2a3b9ce5d..2b7c74650 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -175,6 +175,7 @@
     <string name="remove">Удалить</string>
     <string name="remove_local_sensor">Вы уверены что хотите удалить этот сенсор?</string>
     <string name="remove_this_sensor">Удалить этот датчик</string>
+    <string name="rename_sensor_message">Датчики будут отсортированы в алфавитном порядке.</string>
     <string name="rssi">Сила сигнала (RSSI)</string>
     <string name="s">с</string>
     <string name="scan">СКАНИРОВАТЬ</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b18dcf9db..32033138f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -181,6 +181,7 @@
     <string name="remove_local_sensor">Do you want to remove the sensor? You can add it again later, if needed.</string>
     <string name="remove_shared_sensor">If you remove the sensor, the owner of the sensor will be notified and you cannot access the sensor anymore.</string>
     <string name="remove_this_sensor">Remove this sensor</string>
+    <string name="rename_sensor_message">Your sensors will be in alphabetical order.</string>
     <string name="rssi">Signal strength (RSSI)</string>
     <string name="s">s</string>
     <string name="scan">SCAN</string>

From bf8b18178e8b99ac668d3c42c878def78dd6cf97 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 8 Sep 2021 20:16:56 +0300
Subject: [PATCH 14/33] ISSUE #472 auto organise sensors alphabetically
 according sensor names (quick and allows user to reorganise by renaming)
 [ADDED] FI translations

---
 app/src/main/res/values-fi/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3893a25ac..4b4ff98b4 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -180,6 +180,7 @@
     <string name="remove_local_sensor">Haluatko varmasti poistaa tämän anturin?</string>
     <string name="remove_shared_sensor">Poistamisesta ilmoitetaan anturin omistajalle ja anturin tietojen luku-oikeus päättyy.</string>
     <string name="remove_this_sensor">Poista tämä anturi</string>
+    <string name="rename_sensor_message">Anturisi asettuvat automaattisesti aakkosjärjestykseen.</string>
     <string name="rssi">Signaalin voimakkuus (RSSI)</string>
     <string name="s">s</string>
     <string name="scan">SKANNAA</string>

From a36a04235fd77b40487df7e7dcff55dc6d105323 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 8 Sep 2021 21:47:56 +0300
Subject: [PATCH 15/33] version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 702129272..8a29ec1da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15038
-        versionName "1.5.38"
+        versionCode 15039
+        versionName "1.5.39"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

From 21d7773362b478e314eb40c5ba101397f15384af Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Thu, 9 Sep 2021 21:29:22 +0300
Subject: [PATCH 16/33] ISSUE #415 Apply offsets to existing history data
 [ADDED] auto calibration for history

---
 .../di/CalibrationInjectionModule.kt          |  2 +-
 .../domain/CalibrationInteractor.kt           | 19 ++++++++++++++++++
 .../domain/SensorHistoryRepository.kt         | 20 +++++++++++++++++++
 .../station/database/tables/SensorSettings.kt |  5 ++++-
 .../network/di/NetworkInjectionModule.kt      |  2 +-
 .../domain/NetworkDataSyncInteractor.kt       |  7 ++++---
 6 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/ruuvi/station/calibration/di/CalibrationInjectionModule.kt b/app/src/main/java/com/ruuvi/station/calibration/di/CalibrationInjectionModule.kt
index bdff27258..a692cd416 100644
--- a/app/src/main/java/com/ruuvi/station/calibration/di/CalibrationInjectionModule.kt
+++ b/app/src/main/java/com/ruuvi/station/calibration/di/CalibrationInjectionModule.kt
@@ -11,7 +11,7 @@ import org.kodein.di.generic.*
 object CalibrationInjectionModule {
     val module = Kodein.Module(CalibrationInjectionModule.javaClass.name) {
         bind<CalibrationInteractor>() with singleton {
-            CalibrationInteractor(instance(), instance(), instance(), instance())
+            CalibrationInteractor(instance(), instance(), instance(), instance(), instance())
         }
 
         bind<CalibrateTemperatureViewModel>() with factory { args: CalibrationViewModelArgs ->
diff --git a/app/src/main/java/com/ruuvi/station/calibration/domain/CalibrationInteractor.kt b/app/src/main/java/com/ruuvi/station/calibration/domain/CalibrationInteractor.kt
index 3e6dc5293..4ef67acf1 100644
--- a/app/src/main/java/com/ruuvi/station/calibration/domain/CalibrationInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/calibration/domain/CalibrationInteractor.kt
@@ -1,6 +1,7 @@
 package com.ruuvi.station.calibration.domain
 
 import com.ruuvi.station.calibration.model.CalibrationInfo
+import com.ruuvi.station.database.domain.SensorHistoryRepository
 import com.ruuvi.station.database.domain.SensorSettingsRepository
 import com.ruuvi.station.database.domain.TagRepository
 import com.ruuvi.station.database.tables.RuuviTagEntity
@@ -13,6 +14,7 @@ class CalibrationInteractor (
     val tagRepository: TagRepository,
     val sensorSettingsRepository: SensorSettingsRepository,
     val unitsConverter: UnitsConverter,
+    val sensorHistoryRepository: SensorHistoryRepository,
     private val networkInteractor: RuuviNetworkInteractor
     ) {
     fun getSensorData(sensorId: String): RuuviTagEntity? = tagRepository.getTagById(sensorId)
@@ -29,6 +31,7 @@ class CalibrationInteractor (
             val offset = targetCelsius - fromTemperature
             sensorSettingsRepository.setSensorTemperatureCalibrationOffset(sensorId, offset)
             saveCalibrationToNetwork(sensorId)
+            recalibrateHistory(sensorId)
         }
     }
 
@@ -37,6 +40,7 @@ class CalibrationInteractor (
     fun clearTemperatureCalibration(sensorId: String) {
         sensorSettingsRepository.clearTemperatureCalibration(sensorId)
         saveCalibrationToNetwork(sensorId)
+        recalibrateHistory(sensorId)
     }
 
     private fun isTemperatureCalibrated(settings: SensorSettings?): Boolean = settings?.temperatureOffset ?: 0.0 != 0.0
@@ -115,6 +119,7 @@ class CalibrationInteractor (
     fun clearPressureCalibration(sensorId: String) {
         sensorSettingsRepository.clearPressureCalibration(sensorId)
         saveCalibrationToNetwork(sensorId)
+        recalibrateHistory(sensorId)
     }
 
     fun calibratePressure(sensorId: String, targetValue: Double) {
@@ -125,6 +130,7 @@ class CalibrationInteractor (
             val offset = targetPascal - fromPressure
             sensorSettingsRepository.setSensorPressureCalibrationOffset(sensorId, offset)
             saveCalibrationToNetwork(sensorId)
+            recalibrateHistory(sensorId)
         }
     }
 
@@ -135,6 +141,7 @@ class CalibrationInteractor (
     fun clearHumidityCalibration(sensorId: String) {
         sensorSettingsRepository.clearHumidityCalibration(sensorId)
         saveCalibrationToNetwork(sensorId)
+        recalibrateHistory(sensorId)
     }
 
     fun calibrateHumidity(sensorId: String, targetValue: Double) {
@@ -144,10 +151,22 @@ class CalibrationInteractor (
             val offset = targetValue - fromHumidity
             sensorSettingsRepository.setSensorHumidityOffset(sensorId, offset)
             saveCalibrationToNetwork(sensorId)
+            recalibrateHistory(sensorId)
         }
     }
 
     fun saveCalibrationToNetwork(sensorId: String) {
         networkInteractor.updateSensorCalibration(sensorId)
     }
+
+    fun recalibrateHistory(sensorId: String) {
+        val sensorSettings = sensorSettingsRepository.getSensorSettings(sensorId)
+        sensorSettings?.let {
+            recalibrateHistory(it)
+        }
+    }
+
+    fun recalibrateHistory(sensorSettings: SensorSettings) {
+        sensorHistoryRepository.recalibrate(sensorSettings)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/database/domain/SensorHistoryRepository.kt b/app/src/main/java/com/ruuvi/station/database/domain/SensorHistoryRepository.kt
index 985cac239..4125a1025 100644
--- a/app/src/main/java/com/ruuvi/station/database/domain/SensorHistoryRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/database/domain/SensorHistoryRepository.kt
@@ -5,6 +5,7 @@ import com.raizlabs.android.dbflow.kotlinextensions.from
 import com.raizlabs.android.dbflow.sql.language.Method
 import com.raizlabs.android.dbflow.sql.language.SQLite
 import com.raizlabs.android.dbflow.sql.queriable.StringQuery
+import com.ruuvi.station.database.tables.SensorSettings
 import com.ruuvi.station.database.tables.TagSensorReading
 import com.ruuvi.station.database.tables.TagSensorReading_Table
 import timber.log.Timber
@@ -143,6 +144,25 @@ class SensorHistoryRepository {
         }
     }
 
+    fun recalibrate(sensorSettings: SensorSettings) {
+        fun executeSQL(sql: String) {
+            Timber.d("executeSQL $sql")
+            FlowManager.getWritableDatabase(LocalDatabase.NAME).execSQL(sql)
+        }
+        val updateQuery = """
+            update TagSensorReading 
+                set 
+                    temperature = temperature - ifnull(temperatureOffset, 0) + ${sensorSettings.temperatureOffset ?: 0.0},
+                    humidity = humidity - ifnull(humidityOffset, 0) + ${sensorSettings.humidityOffset ?: 0.0},
+                    pressure = pressure - ifnull(pressureOffset, 0) + ${sensorSettings.pressureOffset ?: 0.0},
+                    temperatureOffset = ${sensorSettings.temperatureOffset ?: 0.0},
+                    humidityOffset = ${sensorSettings.humidityOffset ?: 0.0},
+                    pressureOffset = ${sensorSettings.pressureOffset ?: 0.0}
+            where ruuviTagId = "${sensorSettings.id}"
+        """
+        executeSQL(updateQuery)
+    }
+
     companion object {
         const val POINT_THRESHOLD = 1000
         const val HIGH_DENSITY_INTERVAL_MINUTES = 15
diff --git a/app/src/main/java/com/ruuvi/station/database/tables/SensorSettings.kt b/app/src/main/java/com/ruuvi/station/database/tables/SensorSettings.kt
index 383cf7086..a7d371b21 100644
--- a/app/src/main/java/com/ruuvi/station/database/tables/SensorSettings.kt
+++ b/app/src/main/java/com/ruuvi/station/database/tables/SensorSettings.kt
@@ -2,6 +2,7 @@ package com.ruuvi.station.database.tables
 
 import com.raizlabs.android.dbflow.annotation.*
 import com.raizlabs.android.dbflow.structure.BaseModel
+import com.ruuvi.station.calibration.domain.CalibrationInteractor
 import com.ruuvi.station.database.domain.LocalDatabase
 import com.ruuvi.station.network.data.response.SensorDataResponse
 import java.util.*
@@ -77,13 +78,15 @@ data class SensorSettings(
         sensorReading.humidityOffset = humidityOffset ?: 0.0
     }
 
-    fun updateFromNetwork(sensor: SensorDataResponse) {
+    fun updateFromNetwork(sensor: SensorDataResponse, calibrationInteractor: CalibrationInteractor) {
         name = sensor.name
         owner = sensor.owner
+        val recalibrateHistory = humidityOffset != sensor.offsetHumidity || pressureOffset != sensor.offsetPressure || temperatureOffset != sensor.offsetTemperature
         humidityOffset = sensor.offsetHumidity
         pressureOffset = sensor.offsetPressure
         temperatureOffset = sensor.offsetTemperature
         networkSensor = true
         update()
+        if (recalibrateHistory) calibrationInteractor.recalibrateHistory(this)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt b/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
index 95e370b45..56004491b 100644
--- a/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
+++ b/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
@@ -19,7 +19,7 @@ object NetworkInjectionModule {
         bind<NetworkRequestExecutor>() with singleton { NetworkRequestExecutor(instance(), instance(), instance(), instance(), instance()) }
 
         bind<NetworkDataSyncInteractor>() with singleton {
-            NetworkDataSyncInteractor(instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance())
+            NetworkDataSyncInteractor(instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance())
         }
 
         bind<NetworkApplicationSettings>() with  singleton {
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
index 167374e43..2b6065a7c 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
@@ -4,6 +4,7 @@ import android.net.Uri
 import com.ruuvi.station.app.preferences.GlobalSettings
 import com.ruuvi.station.app.preferences.PreferencesRepository
 import com.ruuvi.station.bluetooth.BluetoothLibrary
+import com.ruuvi.station.calibration.domain.CalibrationInteractor
 import com.ruuvi.station.database.domain.SensorHistoryRepository
 import com.ruuvi.station.database.domain.SensorSettingsRepository
 import com.ruuvi.station.database.domain.TagRepository
@@ -37,7 +38,8 @@ class NetworkDataSyncInteractor (
     private val sensorHistoryRepository: SensorHistoryRepository,
     private val networkRequestExecutor: NetworkRequestExecutor,
     private val networkApplicationSettings: NetworkApplicationSettings,
-    private val networkAlertsSyncInteractor: NetworkAlertsSyncInteractor
+    private val networkAlertsSyncInteractor: NetworkAlertsSyncInteractor,
+    private val calibrationInteractor: CalibrationInteractor
 ) {
     @Volatile
     private var syncJob: Job? = null
@@ -162,7 +164,6 @@ class NetworkDataSyncInteractor (
 
             var since = cal.time
             if (sensorSettings.networkLastSync ?: Date(Long.MIN_VALUE) > since) since = sensorSettings.networkLastSync
-            val originalSince = since
 
             // if we have data for recent minute - skipping update
             if (!since.diffGreaterThan(60*1000)) return
@@ -246,7 +247,7 @@ class NetworkDataSyncInteractor (
         userInfoData.sensors.forEach { sensor ->
             Timber.d("updateTags: $sensor")
             val sensorSettings = sensorSettingsRepository.getSensorSettingsOrCreate(sensor.sensor)
-            sensorSettings.updateFromNetwork(sensor)
+            sensorSettings.updateFromNetwork(sensor, calibrationInteractor)
 
             if (!sensor.picture.isNullOrEmpty()) {
                 setSensorImage(sensor, sensorSettings)

From 68f862c92f181e72d8fac8775f5791a4aaec50df Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Thu, 9 Sep 2021 23:35:31 +0300
Subject: [PATCH 17/33] version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8a29ec1da..57c3f8dbe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15039
-        versionName "1.5.39"
+        versionCode 15040
+        versionName "1.5.40"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

From 4d6f57d70632b39e2b190a69e9405034756e55ea Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Tue, 14 Sep 2021 19:10:44 +0300
Subject: [PATCH 18/33] ISSUE #418 Add Firebase analytics

---
 .../app/preferences/PreferencesRepository.kt  |  2 ++
 .../firebase/di/FirebaseInjectionModule.kt    |  6 ++--
 ...opertiesSaver.kt => FirebaseInteractor.kt} | 33 +++++++++++++++++--
 .../network/di/NetworkInjectionModule.kt      |  4 +--
 .../domain/NetworkDataSyncInteractor.kt       |  5 ++-
 .../network/domain/RuuviNetworkInteractor.kt  |  5 ++-
 .../station/startup/ui/StartupActivity.kt     |  4 +--
 .../station/tag/di/RuuviTagInjectionModule.kt |  2 +-
 .../ruuvi/station/tag/domain/TagInteractor.kt |  5 +--
 .../di/TagDetailsInjectionModule.kt           |  2 +-
 .../tagdetails/ui/TagDetailsViewModel.kt      |  8 +++--
 11 files changed, 57 insertions(+), 19 deletions(-)
 rename app/src/main/java/com/ruuvi/station/firebase/domain/{FirebasePropertiesSaver.kt => FirebaseInteractor.kt} (68%)

diff --git a/app/src/main/java/com/ruuvi/station/app/preferences/PreferencesRepository.kt b/app/src/main/java/com/ruuvi/station/app/preferences/PreferencesRepository.kt
index b01a86f91..fff8c7a58 100644
--- a/app/src/main/java/com/ruuvi/station/app/preferences/PreferencesRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/app/preferences/PreferencesRepository.kt
@@ -150,4 +150,6 @@ class PreferencesRepository(
     fun setLocale(locale: String) {
         preferences.locale = locale
     }
+
+    fun getUserEmail() = preferences.networkEmail
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/firebase/di/FirebaseInjectionModule.kt b/app/src/main/java/com/ruuvi/station/firebase/di/FirebaseInjectionModule.kt
index 81488dcff..4ddf29537 100644
--- a/app/src/main/java/com/ruuvi/station/firebase/di/FirebaseInjectionModule.kt
+++ b/app/src/main/java/com/ruuvi/station/firebase/di/FirebaseInjectionModule.kt
@@ -3,7 +3,7 @@ package com.ruuvi.station.firebase.di
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.ktx.Firebase
-import com.ruuvi.station.firebase.domain.FirebasePropertiesSaver
+import com.ruuvi.station.firebase.domain.FirebaseInteractor
 import org.kodein.di.Kodein
 import org.kodein.di.generic.bind
 import org.kodein.di.generic.instance
@@ -14,8 +14,8 @@ object FirebaseInjectionModule {
 
         bind<FirebaseAnalytics>() with singleton { Firebase.analytics }
 
-        bind<FirebasePropertiesSaver>() with singleton {
-            FirebasePropertiesSaver(instance(), instance(), instance())
+        bind<FirebaseInteractor>() with singleton {
+            FirebaseInteractor(instance(), instance(), instance())
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/firebase/domain/FirebasePropertiesSaver.kt b/app/src/main/java/com/ruuvi/station/firebase/domain/FirebaseInteractor.kt
similarity index 68%
rename from app/src/main/java/com/ruuvi/station/firebase/domain/FirebasePropertiesSaver.kt
rename to app/src/main/java/com/ruuvi/station/firebase/domain/FirebaseInteractor.kt
index 1b9954c16..fc53bfce1 100644
--- a/app/src/main/java/com/ruuvi/station/firebase/domain/FirebasePropertiesSaver.kt
+++ b/app/src/main/java/com/ruuvi/station/firebase/domain/FirebaseInteractor.kt
@@ -1,14 +1,16 @@
 package com.ruuvi.station.firebase.domain
 
 import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.analytics.ktx.logEvent
 import com.ruuvi.station.app.preferences.PreferencesRepository
+import com.ruuvi.station.network.data.response.UserInfoResponseBody
 import com.ruuvi.station.tag.domain.TagInteractor
 import com.ruuvi.station.util.BackgroundScanModes
 import kotlinx.coroutines.*
 import timber.log.Timber
 import java.lang.Exception
 
-class FirebasePropertiesSaver(
+class FirebaseInteractor(
     private val firebaseAnalytics: FirebaseAnalytics,
     private val preferences: PreferencesRepository,
     private val tagInteractor: TagInteractor
@@ -16,7 +18,7 @@ class FirebasePropertiesSaver(
 ) {
     fun saveUserProperties() {
         CoroutineScope(Dispatchers.IO).launch {
-            delay(15*1000)
+            delay(15000)
             Timber.d("FirebasePropertySaver.saveUserProperties")
             try {
                 firebaseAnalytics.setUserProperty("background_scan_enabled",
@@ -47,9 +49,36 @@ class FirebasePropertiesSaver(
                 } else {
                     firebaseAnalytics.setUserProperty("added_tags", "10+")
                 }
+
+                val signedIn = preferences.getUserEmail().isEmpty()
+                firebaseAnalytics.setUserProperty("signed_in", signedIn.toString())
             } catch (e: Exception) {
                 Timber.e(e)
             }
         }
     }
+
+    fun logSignIn() {
+        CoroutineScope(Dispatchers.IO).launch {
+            val addedTags = tagInteractor.getTagEntities(true).size
+            val notAddedTags = tagInteractor.getTagEntities(false).size
+            val seenTags = addedTags + notAddedTags
+
+            firebaseAnalytics.logEvent(FirebaseAnalytics.Event.LOGIN) {
+                param("sensors_added", addedTags.toLong())
+                param("sensors_seen", seenTags.toLong())
+            }
+        }
+    }
+
+    fun logSync(userInfoData: UserInfoResponseBody) {
+        CoroutineScope(Dispatchers.IO).launch {
+            val claimed = userInfoData.sensors.count { it.owner == userInfoData.email }
+            val notOwned = userInfoData.sensors.count { it.owner != userInfoData.email }
+            firebaseAnalytics.logEvent("sync") {
+                param("sensors_claimed", claimed.toLong())
+                param("sensors_shared_to_user", notOwned.toLong())
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt b/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
index 56004491b..291426ba8 100644
--- a/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
+++ b/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
@@ -12,14 +12,14 @@ object NetworkInjectionModule {
 
         bind<NetworkTokenRepository>() with singleton { NetworkTokenRepository(instance(), instance(), instance()) }
 
-        bind<RuuviNetworkInteractor>() with singleton { RuuviNetworkInteractor(instance(), instance(), instance(), instance()) }
+        bind<RuuviNetworkInteractor>() with singleton { RuuviNetworkInteractor(instance(), instance(), instance(), instance(), instance()) }
 
         bind<NetworkSignInInteractor>() with singleton { NetworkSignInInteractor(instance(), instance(), instance()) }
 
         bind<NetworkRequestExecutor>() with singleton { NetworkRequestExecutor(instance(), instance(), instance(), instance(), instance()) }
 
         bind<NetworkDataSyncInteractor>() with singleton {
-            NetworkDataSyncInteractor(instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance())
+            NetworkDataSyncInteractor(instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance(), instance())
         }
 
         bind<NetworkApplicationSettings>() with  singleton {
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
index 2b6065a7c..786053a79 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/NetworkDataSyncInteractor.kt
@@ -10,6 +10,7 @@ import com.ruuvi.station.database.domain.SensorSettingsRepository
 import com.ruuvi.station.database.domain.TagRepository
 import com.ruuvi.station.database.tables.SensorSettings
 import com.ruuvi.station.database.tables.TagSensorReading
+import com.ruuvi.station.firebase.domain.FirebaseInteractor
 import com.ruuvi.station.image.ImageInteractor
 import com.ruuvi.station.network.data.NetworkSyncResult
 import com.ruuvi.station.network.data.NetworkSyncResultType
@@ -39,7 +40,8 @@ class NetworkDataSyncInteractor (
     private val networkRequestExecutor: NetworkRequestExecutor,
     private val networkApplicationSettings: NetworkApplicationSettings,
     private val networkAlertsSyncInteractor: NetworkAlertsSyncInteractor,
-    private val calibrationInteractor: CalibrationInteractor
+    private val calibrationInteractor: CalibrationInteractor,
+    private val firebaseInteractor: FirebaseInteractor
 ) {
     @Volatile
     private var syncJob: Job? = null
@@ -103,6 +105,7 @@ class NetworkDataSyncInteractor (
 
                 val benchUpdate1 = Date()
                 updateSensors(userInfo.data)
+                firebaseInteractor.logSync(userInfo.data)
                 val benchUpdate2 = Date()
                 Timber.d("benchmark-updateTags-finish - ${benchUpdate2.time - benchUpdate1.time} ms")
                 Timber.d("benchmark-syncForPeriod-start")
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
index cb9acb920..129003913 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
@@ -5,6 +5,7 @@ import com.ruuvi.station.database.model.NetworkRequestType
 import com.ruuvi.station.database.tables.Alarm
 import com.ruuvi.station.database.tables.NetworkRequest
 import com.ruuvi.station.database.tables.SensorSettings
+import com.ruuvi.station.firebase.domain.FirebaseInteractor
 import com.ruuvi.station.network.data.NetworkTokenInfo
 import com.ruuvi.station.network.data.request.*
 import com.ruuvi.station.network.data.requestWrappers.UploadImageRequestWrapper
@@ -18,7 +19,8 @@ class RuuviNetworkInteractor (
     private val tokenRepository: NetworkTokenRepository,
     private val networkRepository: RuuviNetworkRepository,
     private val networkRequestExecutor: NetworkRequestExecutor,
-    private val sensorSettingsRepository: SensorSettingsRepository
+    private val sensorSettingsRepository: SensorSettingsRepository,
+    private val firebaseInteractor: FirebaseInteractor
 ) {
     val signedIn: Boolean
         get() = getToken() != null
@@ -44,6 +46,7 @@ class RuuviNetworkInteractor (
                 if (response.error.isNullOrEmpty() && response.data != null) {
                     tokenRepository.saveTokenInfo(
                         NetworkTokenInfo(response.data.email, response.data.accessToken))
+                    firebaseInteractor.logSignIn()
                 }
             }
             onResult(response)
diff --git a/app/src/main/java/com/ruuvi/station/startup/ui/StartupActivity.kt b/app/src/main/java/com/ruuvi/station/startup/ui/StartupActivity.kt
index 9831d1c79..819febe78 100644
--- a/app/src/main/java/com/ruuvi/station/startup/ui/StartupActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/startup/ui/StartupActivity.kt
@@ -9,7 +9,7 @@ import com.ruuvi.station.R
 import com.ruuvi.station.dashboard.ui.DashboardActivity
 import com.ruuvi.station.welcome.ui.WelcomeActivity
 import com.ruuvi.station.welcome.ui.WelcomeActivity.Companion.ARGUMENT_FROM_WELCOME
-import com.ruuvi.station.firebase.domain.FirebasePropertiesSaver
+import com.ruuvi.station.firebase.domain.FirebaseInteractor
 import com.ruuvi.station.tagdetails.ui.TagDetailsActivity
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.closestKodein
@@ -20,7 +20,7 @@ class StartupActivity : AppCompatActivity(), KodeinAware {
     override val kodein by closestKodein()
 
     private val viewModel: StartupActivityViewModel by viewModel()
-    private val firebasePropertySaver: FirebasePropertiesSaver by instance()
+    private val firebasePropertySaver: FirebaseInteractor by instance()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/com/ruuvi/station/tag/di/RuuviTagInjectionModule.kt b/app/src/main/java/com/ruuvi/station/tag/di/RuuviTagInjectionModule.kt
index e2acf3aa1..11a96359a 100644
--- a/app/src/main/java/com/ruuvi/station/tag/di/RuuviTagInjectionModule.kt
+++ b/app/src/main/java/com/ruuvi/station/tag/di/RuuviTagInjectionModule.kt
@@ -12,7 +12,7 @@ object RuuviTagInjectionModule {
     val module = Kodein.Module(RuuviTagInjectionModule.javaClass.name) {
 
         bind<TagInteractor>() with singleton {
-            TagInteractor(instance(), instance(), instance(), instance(), instance())
+            TagInteractor(instance(), instance(), instance(), instance())
         }
 
         bind<TagConverter>() with singleton {
diff --git a/app/src/main/java/com/ruuvi/station/tag/domain/TagInteractor.kt b/app/src/main/java/com/ruuvi/station/tag/domain/TagInteractor.kt
index a2c17a29d..b1c7f23d9 100644
--- a/app/src/main/java/com/ruuvi/station/tag/domain/TagInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/tag/domain/TagInteractor.kt
@@ -5,7 +5,6 @@ import com.ruuvi.station.app.preferences.PreferencesRepository
 import com.ruuvi.station.database.domain.TagRepository
 import com.ruuvi.station.database.domain.SensorHistoryRepository
 import com.ruuvi.station.database.tables.RuuviTagEntity
-import com.ruuvi.station.network.domain.NetworkApplicationSettings
 import com.ruuvi.station.util.BackgroundScanModes
 import timber.log.Timber
 
@@ -13,8 +12,7 @@ class TagInteractor constructor(
     private val tagRepository: TagRepository,
     private val sensorHistoryRepository: SensorHistoryRepository,
     private val preferencesRepository: PreferencesRepository,
-    private val alarmCheckInteractor: AlarmCheckInteractor,
-    private val networkApplicationSettings: NetworkApplicationSettings
+    private val alarmCheckInteractor: AlarmCheckInteractor
 ) {
 
     fun getTags(): List<RuuviTag> =
@@ -38,7 +36,6 @@ class TagInteractor constructor(
 
     fun setBackgroundScanMode(mode: BackgroundScanModes) {
         preferencesRepository.setBackgroundScanMode(mode)
-        networkApplicationSettings.updateBackgroundScanMode()
     }
 
     fun isFirstGraphVisit(): Boolean =
diff --git a/app/src/main/java/com/ruuvi/station/tagdetails/di/TagDetailsInjectionModule.kt b/app/src/main/java/com/ruuvi/station/tagdetails/di/TagDetailsInjectionModule.kt
index 407fa8fbf..fc2110964 100644
--- a/app/src/main/java/com/ruuvi/station/tagdetails/di/TagDetailsInjectionModule.kt
+++ b/app/src/main/java/com/ruuvi/station/tagdetails/di/TagDetailsInjectionModule.kt
@@ -21,7 +21,7 @@ object TagDetailsInjectionModule {
         }
 
         bind<TagDetailsViewModel>() with factory { args: TagDetailsArguments ->
-            TagDetailsViewModel(args, instance(), instance(), instance(), instance(), instance())
+            TagDetailsViewModel(args, instance(), instance(), instance(), instance(), instance(), instance())
         }
 
         bind<TagViewModel>() with factory { args: TagViewModelArgs ->
diff --git a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt
index 3d37cc1ba..e1135ec4f 100644
--- a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt
+++ b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsViewModel.kt
@@ -19,6 +19,7 @@ import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
+import com.ruuvi.station.network.domain.NetworkApplicationSettings
 
 class TagDetailsViewModel(
     tagDetailsArguments: TagDetailsArguments,
@@ -26,7 +27,8 @@ class TagDetailsViewModel(
     private val alarmCheckInteractor: AlarmCheckInteractor,
     private val networkDataSyncInteractor: NetworkDataSyncInteractor,
     private val preferencesRepository: PreferencesRepository,
-    private val tokenRepository: NetworkTokenRepository
+    private val tokenRepository: NetworkTokenRepository,
+    private val networkApplicationSettings: NetworkApplicationSettings
 ) : ViewModel() {
 
     private val ioScope = CoroutineScope(Dispatchers.IO)
@@ -115,8 +117,10 @@ class TagDetailsViewModel(
     fun getBackgroundScanMode(): BackgroundScanModes =
         interactor.getBackgroundScanMode()
 
-    fun setBackgroundScanMode(mode: BackgroundScanModes) =
+    fun setBackgroundScanMode(mode: BackgroundScanModes) {
         interactor.setBackgroundScanMode(mode)
+        networkApplicationSettings.updateBackgroundScanMode()
+    }
 
     fun isFirstGraphVisit(): Boolean =
         interactor.isFirstGraphVisit()

From c39b95539807991d3259ab13cd225325670be7d9 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Tue, 14 Sep 2021 19:12:59 +0300
Subject: [PATCH 19/33] version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 57c3f8dbe..739326eea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15040
-        versionName "1.5.40"
+        versionCode 15041
+        versionName "1.5.41"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

From 46834516250cb02b86691ffa4e3695fa51a71141 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 15 Sep 2021 18:32:59 +0300
Subject: [PATCH 20/33] ISSUE #459 Share Ruuvi sensor page doesn't show how
 many sensors out of max 10 shared [ADDED] counter for list of users on share
 page

---
 app/build.gradle                              |  2 +-
 .../station/network/ui/ShareSensorActivity.kt |  2 +-
 app/src/main/res/values-fi/strings.xml        | 36 +++++++++----------
 app/src/main/res/values-fr/strings.xml        | 12 +++----
 app/src/main/res/values-ru/strings.xml        | 12 +++----
 app/src/main/res/values-sv/strings.xml        | 14 ++++----
 app/src/main/res/values/strings.xml           | 28 +++++++--------
 7 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 739326eea..030698343 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -79,7 +79,7 @@ dependencies {
     implementation 'com.opencsv:opencsv:3.10'
 
     implementation 'com.github.ruuvi:com.ruuvi.bluetooth:1.2.1'
-    implementation 'com.github.ruuvi:com.ruuvi.bluetooth.default:1.2.5'
+    implementation 'com.github.ruuvi:com.ruuvi.bluetooth.default:1.2.6'
     //implementation project(':bluetooth_library')
     //implementation project(':default_bluetooth_library')
 
diff --git a/app/src/main/java/com/ruuvi/station/network/ui/ShareSensorActivity.kt b/app/src/main/java/com/ruuvi/station/network/ui/ShareSensorActivity.kt
index a9252d59b..1471d95d7 100644
--- a/app/src/main/java/com/ruuvi/station/network/ui/ShareSensorActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/network/ui/ShareSensorActivity.kt
@@ -69,7 +69,7 @@ class ShareSensorActivity : AppCompatActivity(R.layout.activity_share_sensor) ,
             emailsList.clear()
             emailsList.addAll(it)
             binding.sharedTextView.isVisible = emailsList.isNotEmpty()
-
+            binding.sharedTextView.text = getString(R.string.share_sensor_already_shared, emailsList.size, 10)
             adapter.notifyDataSetChanged()
         }
 
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 4b4ff98b4..b6c3c8bfe 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -34,9 +34,9 @@
     <string name="calibrated">Kalibroitu: %1$s</string>
     <string name="calibration_clear_confirm">Poista kalibrointiasetuset?</string>
     <string name="calibration_corrected_value">Korjattu arvo</string>
-    <string name="calibration_description">Anturin kalibrointi ei ole tarpeellista normaalissa käytössä.\n\nTämä ominaisuus on tarkoitettu edistyneille käyttäjille.\n\nKalibroinnin lisäohjeet löytyvät osoitteesta ruuvi.com/support</string>
-    <string name="calibration_description_link">ruuvi.com/support</string>
-    <string name="calibration_description_link_url">http://ruuvi.com/support</string>
+    <string name="calibration_description">Anturin kalibrointi ei ole tarpeellista normaalissa käytössä.\n\nTämä ominaisuus on tarkoitettu edistyneille käyttäjille.\n\nKalibroinnin lisäohjeet löytyvät osoitteesta ruuvi.com/fi/tuki</string>
+    <string name="calibration_description_link">ruuvi.com/fi/tuki</string>
+    <string name="calibration_description_link_url">http://ruuvi.com/fi/tuki</string>
     <string name="calibration_done">Kalibrointi valmis!</string>
     <string name="calibration_enter_humidity">Syötä anturin oletettu kosteus tämänhetkisissä olosuhteissa (%1$s): </string>
     <string name="calibration_enter_pressure">Syötä anturin oletettu paine tämänhetkisissä olosuhteissa (%1$s): </string>
@@ -57,11 +57,11 @@
     <string name="cancel">Peruuta</string>
     <string name="charts_background_dialog_description">Historiatietojen kerääminen toimii parhaiten taustaskannauksen ollessa käytössä.</string>
     <string name="charts_background_dialog_title_question">Haluatko ottaa käyttöön taustaskannauksen?</string>
-    <string name="claim_description">Omistatko tämän anturin? Vahvista omistajuus ja anturi lisätään Ruuvi-tilillesi. Jokaisella Ruuvi-anturilla voi olla vain yksi omistaja.\n\nHyödyt:\n\n ● Anturien nimet, taustakuvat, kalibrointi- ja hälytystiedot turvallisesta pilvipalvelusta\n\n ● Lue anturitiedot etänä verkossa (vaatii Ruuvi Gateway -reitittimen)\n\n ● Jaa antureita ystävien ja perheen kesken (vaatii Ruuvi Gateway -reitittimen)\n\n ● Jopa 2 vuoden historiatiedot osoitteesta station.ruuvi.com (vaatii Ruuvi Gateway -reitittimen)</string>
+    <string name="claim_description">Omistatko tämän anturin? Vahvista omistajuus ja anturi lisätään Ruuvi-tilillesi. Jokaisella Ruuvi-anturilla voi olla vain yksi omistaja.\n\nHyödyt:\n\n ● Anturien nimet, taustakuvat sekä kalibrointi- ja hälytysasetukset tallentuvat turvallisesti tilillesi pilvipalveluun\n\n ● Lue anturitiedot etänä verkossa (vaatii Ruuvi Gateway -reitittimen)\n\n ● Jaa antureita ystävien ja perheen kesken (vaatii Ruuvi Gateway -reitittimen)\n\n ● Selaa jopa 2 vuoden historiatietoja osoitteessa station.ruuvi.com (vaatii Ruuvi Gateway -reitittimen)</string>
     <string name="claim_ownership">Vahvista Omistajuus</string>
     <string name="claim_sensor">Vahvista omistajuus</string>
     <string name="clear">Pyyhi</string>
-    <string name="clear_confirm">Tyhjennetäänkö sovellukseen tallennetut historiatiedot?</string>
+    <string name="clear_confirm">Tyhjennetäänkö sovellukseen paikallisesti tallennetut historiatiedot?</string>
     <string name="close">Sulje</string>
     <string name="confirm">Vahvista</string>
     <string name="connected_reading_info">Synkronoidaan...</string>
@@ -74,12 +74,12 @@
     <string name="data_forwarding_url">Välityspalvelimen URL-osoite</string>
     <string name="data_forwarding_url_hint">https://välitys.palvelin/...</string>
     <string name="data_points_read">%1$,d mittausta luettu, tallennetaan...</string>
-    <string name="days">Päivää</string>
+    <string name="days">päivää</string>
     <string name="disconnected">Ei yhteyttä</string>
     <string name="email">Sähköposti</string>
     <string name="export">VIE</string>
     <string name="export_csv_chooser_title">Anturin %1$s CSV-lokitiedosto</string>
-    <string name="export_csv_created">.csv tiedosto luotu, avataan tiedostonjako-ikkuna</string>
+    <string name="export_csv_created">.csv tiedosto luotu, avataan tiedostonjakoikkuna</string>
     <string name="export_csv_failed">CSV-tiedoston luonti epäonnistui</string>
     <string name="export_csv_header_format2_4">Päivämäärä,Lämpötila (%1$s), Ilmankosteus (%2$s), Ilmanpaine (%3$s),Lähetysteho</string>
     <string name="export_csv_header_format3">Päivämäärä,Lämpötila (%1$s), Ilmankosteus (%2$s), Ilmanpaine (%3$s),Lähetysteho,Kiihtyvyys X,Kiihtyvyys Y,Kiihtyvyys Z,Jännite</string>
@@ -95,20 +95,20 @@
     <string name="help_about_text">Ruuvi Station on helppokäyttöinen sovellus Ruuvin tuotteiden hallinnointiin. Aloita lisäämällä antureita.</string>
     <string name="help_about_title">TIETOA / APUA</string>
     <string name="help_added_tags">Lisätyt anturit: %1$,d</string>
-    <string name="help_db_data_points">Tallennetut mittaukset: %1$,d</string>
+    <string name="help_db_data_points">Paikallisesti tallennettujen mittausten lukumäärä: %1$,d</string>
     <string name="help_db_size">Tietokannan koko: %1$,d kt</string>
-    <string name="help_more_to_read_text">Ruuvin kotisivu: ruuvi.com\nRuuvi Forum: f.ruuvi.com\nRuuvi Blog: blog.ruuvi.com\nRuuvi Twitter: twitter.com/ruuvicom</string>
+    <string name="help_more_to_read_text">Ruuvin kotisivu: ruuvi.com\nRuuvi Forum: f.ruuvi.com\nRuuvi Blog: ruuvi.com/fi/blogi\nRuuvi Twitter: twitter.com/ruuvicom</string>
     <string name="help_more_to_read_title">LUE LISÄÄ</string>
     <string name="help_opensource_text">Kuten muutkin Ruuvin tuotteet, myös Ruuvi Station perustuu avoimeen lähdekoodiin: github.com/ruuvi</string>
     <string name="help_opensource_title">AVOIN LÄHDEKOODI</string>
-    <string name="help_operations_text">Olemme suunnitelleet ohjelman ja laitteemme mahdollisimman helppokäyttöisiksi, mutta myös ohjeet ovat saatavilla osoitteessa ruuvi.com/manuals</string>
+    <string name="help_operations_text">Olemme suunnitelleet ohjelman ja laitteemme mahdollisimman helppokäyttöisiksi, mutta myös ohjeet ovat saatavilla osoitteessa ruuvi.com/fi/tuki</string>
     <string name="help_operations_title">KÄYTTÖOHJE</string>
-    <string name="help_privacy_policy_text">Sovelluksen käyttäminen vaatii Ruuvin käyttöehtojen hyväksymisen\nruuvi.com/terms</string>
+    <string name="help_privacy_policy_text">Sovelluksen käyttäminen vaatii Ruuvin käyttöehtojen hyväksymisen: ruuvi.com/terms</string>
     <string name="help_privacy_policy_title">TIETOSUOJAKÄYTÄNTÖ</string>
     <string name="help_seen_tags">Havaitut anturit: %1$,d</string>
-    <string name="help_troubleshooting_text">Jos törmäät ongelmiin ja ohjeet eivät auttaneet, tarkista vianetsintäkysymykset:  ruuvi.com/troubles</string>
+    <string name="help_troubleshooting_text">Jos törmäät ongelmiin ja ohjeet eivät auttaneet, tarkista vianetsintäkysymykset: ruuvi.com/fi/tuki</string>
     <string name="help_troubleshooting_title">VIANETSINTÄ</string>
-    <string name="hours">Tuntia</string>
+    <string name="hours">tuntia</string>
     <string name="humidity">Kosteus</string>
     <string name="humidity_absolute_name">Absoluuttinen (g/m³)</string>
     <string name="humidity_absolute_unit">g/m³</string>
@@ -141,7 +141,7 @@
     <string name="name">NIMI</string>
     <string name="navigation_drawer_close">Sulje siirtymisvalikko</string>
     <string name="navigation_drawer_open">Avaa siirtymisvalikko</string>
-    <string name="network_sharing_disabled">Voit jakaa vain Ruuvi Gateway -reitittimen läheisyydessä olevia antureita. Lisätietoja reitittimestä osoitteesta ruuvi.com</string>
+    <string name="network_sharing_disabled">Voit jakaa vain Ruuvi Gateway -reitittimen läheisyydessä olevia antureita. Lisätietoja reitittimestä osoitteesta ruuvi.com/fi/gateway</string>
     <string name="network_status_title">Ruuvin pilven tila</string>
     <string name="network_sync_result_exception">Synkronointi epäonnistui: %1$s</string>
     <string name="network_sync_result_not_logged">Synkronointi epäonnistui: kirjaudu ensin</string>
@@ -178,7 +178,7 @@
     <string name="remove">Poista</string>
     <string name="remove_claimed_sensor">Anturin poistaminen mitätöi omistajuuden. Kuka tahansa voi vaatia anturin omistajuutta poistamisen jälkeen. Jokaisella Ruuvi-anturilla voi olla vain yksi omistaja.</string>
     <string name="remove_local_sensor">Haluatko varmasti poistaa tämän anturin?</string>
-    <string name="remove_shared_sensor">Poistamisesta ilmoitetaan anturin omistajalle ja anturin tietojen luku-oikeus päättyy.</string>
+    <string name="remove_shared_sensor">Poistamisesta ilmoitetaan anturin omistajalle ja anturin tietojen lukuoikeus päättyy.</string>
     <string name="remove_this_sensor">Poista tämä anturi</string>
     <string name="rename_sensor_message">Anturisi asettuvat automaattisesti aakkosjärjestykseen.</string>
     <string name="rssi">Signaalin voimakkuus (RSSI)</string>
@@ -235,8 +235,8 @@
     <string name="settings_temperature_unit_details">Valitse sovelluksessa käytettävä lämpötilayksikkö</string>
     <string name="share">Jaa</string>
     <string name="share_sensor_add_friend">Lisää ystävä</string>
-    <string name="share_sensor_already_shared">Anturi on jo jaettu</string>
-    <string name="share_sensor_description">Voit jakaa tämän anturin ystäville tai perheenjäsenille, mikäli laite on Ruuvi Gateway -reitittimen kuuluvuusalueella.\n\nVastaanottaja saa jakamisesta ilmoituksen sähköpostilla. Ilmainen Ruuvi-tili luodaan ensimmäisen sisäänkirjautumisen yhteydessä, mikäli vastaanottajalla ei ole vielä Ruuvi-tiliä.\n\nAnturin nimi ja taustakuva jaetaan ensimmäisen synkronoinnin yhteydessä, jonka jälkeen vastaanottaja voi muokata tietoja haluamallaan tavalla. Kalibroidut arvot (mikäli käytössä) synkronoidaan automaattisesti. Vastaanottaja näkee aina korjatut arvot.</string>
+    <string name="share_sensor_already_shared">Anturi on jo jaettu %1$,d/%2$,d</string>
+    <string name="share_sensor_description">Voit jakaa tämän anturin ystäville tai perheenjäsenille, mikäli laite on Ruuvi Gateway -reitittimen kuuluvuusalueella.\n\nVastaanottaja saa jakamisesta ilmoituksen sähköpostilla. Ilmainen Ruuvi-tili luodaan ensimmäisen sisäänkirjautumisen yhteydessä, mikäli vastaanottajalla ei ole vielä Ruuvi-tiliä.\n\nAnturin nimi ja taustakuva jaetaan vastaanottajalle vain kertaalleen. Sen jälkeen kumpikin voivat muokata vain omia anturiasetuksiaan. Kalibrointiarvot (mikäli käytössä) synkronoidaan automaattisesti jaetuille antureille ja vastaanottaja näkee vain lopulliset korjatut arvot.</string>
     <string name="share_sensor_send_button">Lähetä</string>
     <string name="share_sensor_title">Jaa anturi</string>
     <string name="share_sensor_unshare_confirm">Haluatko lopettaa anturin jakamisen käyttäjälle %1$s?</string>
@@ -251,7 +251,7 @@
     <string name="sign_in_request_code">Pyydä kirjautumiskoodi</string>
     <string name="sign_in_submit_button">Lähetä</string>
     <string name="sign_out">Kirjaudu ulos</string>
-    <string name="sign_out_confirm">Anturit, joiden omistajuuden olet vahvistanut asetussivulla poistetaan sovelluksesta automaattisesti uloskirjauduttaessa. Anturitiedot palautetaan pilvipalvelusta samalla sähköpostiosoitteella uudelleenkirjauduttaessa.\n\n Haluatko varmasti kirjautua ulos?</string>
+    <string name="sign_out_confirm">Anturit, joiden omistajuuden olet vahvistanut asetussivulla poistetaan sovelluksesta automaattisesti uloskirjauduttaessa. Anturitiedot palautetaan pilvipalvelusta samalla sähköpostiosoitteella uudelleenkirjauduttaessa.\n\nHaluatko varmasti kirjautua ulos?</string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">dBm</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 3943fc6bf..ff078dd69 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -93,16 +93,16 @@
     <string name="help_added_tags">Capteurs jumelés : %1$,d</string>
     <string name="help_db_data_points">Données enregistrées : %1$,d</string>
     <string name="help_db_size">Taille de la base de données : %1$,d kB</string>
-    <string name="help_more_to_read_text">Site officiel de Ruuvi : ruuvi.com\nRuuvi Forum : f.ruuvi.com\nRuuvi Blog : blog.ruuvi.com\nRuuvi Twitter : twitter.com/ruuvicom</string>
+    <string name="help_more_to_read_text">Site officiel de Ruuvi : ruuvi.com\nRuuvi Forum : f.ruuvi.com\nRuuvi Blog : ruuvi.com/blog\nRuuvi Twitter : twitter.com/ruuvicom</string>
     <string name="help_more_to_read_title">PLUS D\'INFOS</string>
     <string name="help_opensource_text">Comme tous les produits Ruuvi, Ruuvi Station est également open-source : github.com/ruuvi</string>
     <string name="help_opensource_title">OPEN-SOURCE</string>
-    <string name="help_operations_text">Nous avons conçu nos produits et leur application pour qu\'ils soient faciles à utiliser. Une notice est cependant disponible : ruuvi.com/manuals</string>
+    <string name="help_operations_text">Nous avons conçu nos produits et leur application pour qu\'ils soient faciles à utiliser. Une notice est cependant disponible : ruuvi.com/support</string>
     <string name="help_operations_title">NOTICE D\'UTILISATION</string>
-    <string name="help_privacy_policy_text">L\'utilisation de l\'application nécessite l\'approbation des conditions générales de Ruuvi \nruuvi.com/terms</string>
+    <string name="help_privacy_policy_text">L\'utilisation de l\'application nécessite l\'approbation des conditions générales de Ruuvi: ruuvi.com/terms</string>
     <string name="help_privacy_policy_title">PROTECTION DES DONNÉES PERSONNELLES</string>
     <string name="help_seen_tags">Capteurs détectés : %1$,d</string>
-    <string name="help_troubleshooting_text">Si vous rencontrez des problèmes et que vous ne trouvez pas la réponse dans la notice, veuillez consulter la page d\'assistance technique : ruuvi.com/troubles</string>
+    <string name="help_troubleshooting_text">Si vous rencontrez des problèmes et que vous ne trouvez pas la réponse dans la notice, veuillez consulter la page d\'assistance technique : ruuvi.com/support</string>
     <string name="help_troubleshooting_title">DÉPANNAGE TECHNIQUE</string>
     <string name="hours">Heures</string>
     <string name="humidity">Humidité</string>
@@ -136,7 +136,7 @@
     <string name="name">NOM</string>
     <string name="navigation_drawer_close">Fermer le menu</string>
     <string name="navigation_drawer_open">Ouvrir le menu</string>
-    <string name="network_sharing_disabled">Vous pouvez partager seulement des capteurs à proximité du Ruuvi Gateway. Plus d\'infos sur ruuvi.com</string>
+    <string name="network_sharing_disabled">Vous pouvez partager seulement des capteurs à proximité du Ruuvi Gateway. Plus d\'infos sur ruuvi.com/gateway</string>
     <string name="network_sync_result_exception">Echec de la synchronisation : %1$s</string>
     <string name="network_sync_result_not_logged">Echec de la synchronisation : veuillez vous connecter</string>
     <string name="network_sync_result_success">Synchronisation réussie!</string>
@@ -223,7 +223,7 @@
     <string name="settings_temperature_unit_details">Choisissez l\'unité souhaitée pour la température</string>
     <string name="share">Partager</string>
     <string name="share_sensor_add_friend">Ajouter un ami</string>
-    <string name="share_sensor_already_shared">Le capteur est déjà partagé</string>
+    <string name="share_sensor_already_shared">Le capteur est déjà partagé %1$,d/%2$,d</string>
     <string name="share_sensor_send_button">Envoyer</string>
     <string name="share_sensor_title">Partager le capteur</string>
     <string name="share_sensor_unshare_confirm">Voulez-vous arrêter le partage du capteur avec %1$s ?</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2b7c74650..2f42e7365 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -94,16 +94,16 @@
     <string name="help_added_tags">Добавленных датчиков: %1$,d</string>
     <string name="help_db_data_points">Кол-во сохраненных измерений: %1$,d</string>
     <string name="help_db_size">Размер базы данных: %1$,d кБ</string>
-    <string name="help_more_to_read_text">Веб-сайт: ruuvi.com\nФорум: f.ruuvi.com\nБлог: blog.ruuvi.com\nTwitter: twitter.com/ruuvicom</string>
+    <string name="help_more_to_read_text">Веб-сайт: ruuvi.com\nФорум: f.ruuvi.com\nБлог: ruuvi.com\nTwitter: twitter.com/ruuvicom</string>
     <string name="help_more_to_read_title">ПОЧИТАТЬ ЕЩЕ</string>
     <string name="help_opensource_text">Как и сенсоры Ruuvi, Ruuvi Station также доступна в исходных кодах: github.com/ruuvi</string>
     <string name="help_opensource_title">ОТКРЫТЫЙ ИСХОДНЫЙ КОД</string>
-    <string name="help_operations_text">Мы разработали приложение так, чтобы оно было интуитивно понятным. В то же время, руководства доступны здесь: ruuvi.com/manuals</string>
+    <string name="help_operations_text">Мы разработали приложение так, чтобы оно было интуитивно понятным. В то же время, руководства доступны здесь: ruuvi.com/support</string>
     <string name="help_operations_title">РУКОВОДСТВО</string>
-    <string name="help_privacy_policy_text">Используя это приложение, вы соглашаетесь со стандартными условиями и положениями Ruuvi\nruuvi.com/terms</string>
+    <string name="help_privacy_policy_text">Используя это приложение, вы соглашаетесь со стандартными условиями и положениями Ruuvi: ruuvi.com/terms</string>
     <string name="help_privacy_policy_title">ПОЛИТИКА КОНФИДЕНЦИАЛЬНОСТИ</string>
     <string name="help_seen_tags">Датчиков обнаружено: %1$,d</string>
-    <string name="help_troubleshooting_text">Если вы испытываете какие либо проблемы или наши руководства не помогли вам, посмотрите наши многочисленные темы с решением проблем здесь: ruuvi.com/troubles</string>
+    <string name="help_troubleshooting_text">Если вы испытываете какие либо проблемы или наши руководства не помогли вам, посмотрите наши многочисленные темы с решением проблем здесь: ruuvi.com/support</string>
     <string name="help_troubleshooting_title">РЕШЕНИЕ ПРОБЛЕМ</string>
     <string name="hours">Часов</string>
     <string name="humidity">Влажность</string>
@@ -138,7 +138,7 @@
     <string name="name">ИМЯ</string>
     <string name="navigation_drawer_close">Закрыть навигационную панель</string>
     <string name="navigation_drawer_open">Открыть навигационную панель</string>
-    <string name="network_sharing_disabled">Вы можете поделиться сенсорами только из зоны покрытия Ruuvi Gateway. Если у вас нет Gateway, вы можете приобрести его на ruuvi.com</string>
+    <string name="network_sharing_disabled">Вы можете поделиться сенсорами только из зоны покрытия Ruuvi Gateway. Если у вас нет Gateway, вы можете приобрести его на ruuvi.com/gateway</string>
     <string name="network_status_title">Статус сети Ruuvi</string>
     <string name="network_sync_result_exception">Ошибка синхронизации: %1$s</string>
     <string name="network_sync_result_not_logged">Ошибка синхронизации: необходимо залогиниться вначале</string>
@@ -228,7 +228,7 @@
     <string name="settings_temperature_unit_details">Выберите единицу измерения температуры для отображения</string>
     <string name="share">Поделиться</string>
     <string name="share_sensor_add_friend">Добавить друга</string>
-    <string name="share_sensor_already_shared">Поделились</string>
+    <string name="share_sensor_already_shared">Предоставлен доступ %1$,d/%2$,d</string>
     <string name="share_sensor_send_button">Отправить</string>
     <string name="share_sensor_title">Поделиться датчиком Ruuvi</string>
     <string name="share_sensor_unshare_confirm">Хотите перестать делиться показаниями датчика с %1$s?</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 80951eae2..51ac7d8e5 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -97,16 +97,16 @@
     <string name="help_added_tags">Tillagda sensorer: %1$,d</string>
     <string name="help_db_data_points">Sparade mätningar: %1$,d</string>
     <string name="help_db_size">Databasens storlek: %1$,d kB</string>
-    <string name="help_more_to_read_text">Ruuvis hemsida: ruuvi.com\nRuuvi Forum: f.ruuvi.com\nRuuvi Blog: blog.ruuvi.com\nRuuvi Twitter: twitter.com/ruuvicom</string>
+    <string name="help_more_to_read_text">Ruuvis hemsida: ruuvi.com\nRuuvi Forum: f.ruuvi.com\nRuuvi Blog: ruuvi.com/blog\nRuuvi Twitter: twitter.com/ruuvicom</string>
     <string name="help_more_to_read_title">LÄS MER</string>
     <string name="help_opensource_text">Likt Ruuvi sensor är också Ruuvi Station gjord med öppen källkod: github.com/ruuvi</string>
     <string name="help_opensource_title">ÖPPEN KÄLLKOD</string>
-    <string name="help_operations_text">Vi har designat appen så att den ska vara självförklarande men det finns också heltäckande manualer för både Ruuvi sensorer och Ruuvi Station: ruuvi.com/manuals</string>
+    <string name="help_operations_text">Vi har designat appen så att den ska vara självförklarande men det finns också heltäckande manualer för både Ruuvi sensorer och Ruuvi Station: ruuvi.com/support</string>
     <string name="help_operations_title">BRUKSANVISNING</string>
     <string name="help_privacy_policy_text">Användning av applikationen kräver godkännande av användarvillkoren\nruuvi.com/terms</string>
     <string name="help_privacy_policy_title">INTEGRITETSPOLICY</string>
     <string name="help_seen_tags">Upptäckta sensorer: %1$,d</string>
-    <string name="help_troubleshooting_text">Om du stöter på problem och våra manualer inte hjälper så kan det hjälpa att ta en titt på våra många felsökningsämnen: ruuvi.com/troubles</string>
+    <string name="help_troubleshooting_text">Om du stöter på problem och våra manualer inte hjälper så kan det hjälpa att ta en titt på våra många felsökningsämnen: ruuvi.com/support</string>
     <string name="help_troubleshooting_title">FELSÖKNING</string>
     <string name="hours">Timmar</string>
     <string name="humidity">Fuktighet</string>
@@ -141,7 +141,7 @@
     <string name="name">NAMN</string>
     <string name="navigation_drawer_close">Stäng navigationslådan</string>
     <string name="navigation_drawer_open">Öppna navigationslådan</string>
-    <string name="network_sharing_disabled">Endast sensorer inom räckhåll av din Ruuvi Gateway kan delas. Mer information finns på ruuvi.com</string>
+    <string name="network_sharing_disabled">Endast sensorer inom räckhåll av din Ruuvi Gateway kan delas. Mer information finns på ruuvi.com/gateway</string>
     <string name="network_status_title">Ruuvi cloud status</string>
     <string name="network_sync_result_exception">Synkroniseringen misslyckades: %1$s</string>
     <string name="network_sync_result_not_logged">Synkroniseringen misslyckades: du måste vara inloggad</string>
@@ -234,14 +234,14 @@
     <string name="settings_temperature_unit_details">Välj den temperaturenhet som du vill ska visas</string>
     <string name="share">Dela</string>
     <string name="share_sensor_add_friend">Lägg till vän</string>
-    <string name="share_sensor_already_shared">Sensorn är redan delad</string>
+    <string name="share_sensor_already_shared">Sensorn är redan delad %1$,d/%2$,d</string>
     <string name="share_sensor_description">Du kan dela sensorn med vänner och familj om den är inom räckhåll för en Ruuvi Gateway.\n\nMottagaren meddelas via e-post. Om mottagaren inte har ett Ruuvi-konto skapas ett gratis Ruuvi-konto automatiskt vid första inloggningen.\n\nObservera att sensorns anpassade namn och bakgrundsbild delas. Namnet och bildsynkroniseringen sker endast vid en gång, efteråt kan det anpassas av mottagaren. Kalibreringsvärden (om sådana finns) synkroniseras automatiskt och mottagaren ser alltid de korrigerade värdena.</string>
     <string name="share_sensor_send_button">Skicka</string>
     <string name="share_sensor_title">Dela sensor</string>
     <string name="share_sensor_unshare_confirm">Vill du sluta dela sensorn med %1$s?</string>
     <string name="sign_in">Logga in</string>
     <string name="sign_in_benefits_description">Efter inloggning markeras du automatiskt som ägare till dina närliggande Ruuvi-sensorer. Sensorernas ägare kommer att återställas om appen installerats om igen.\n\nMed en Ruuvi Gateway kan du övervaka dina sensorer på distans och dele dem med dina vänner.</string>
-    <string name="sign_in_benefits_title">Fördelarna med Ruuvi Cloud</string>
+    <string name="sign_in_benefits_title">Fördelarna med Ruuvi cloud</string>
     <string name="sign_in_check_email">Kontrollera din e-post efter en aktiveringskod.</string>
     <string name="sign_in_code_hint">Kod</string>
     <string name="sign_in_email_sent">E-post skickat</string>
@@ -250,7 +250,7 @@
     <string name="sign_in_request_code">Begär en inloggningskod</string>
     <string name="sign_in_submit_button">Skicka</string>
     <string name="sign_out">Logga ut</string>
-    <string name="sign_out_confirm">Sensorer som du har verifierat äganderätten till på inställningssidan tas automatiskt bort från appen när du loggar ut. Sensordata hämtas från molnet igen om du loggar in med samma e-postadress.\n\n Är du säker på att du vill logga ut? </string>
+    <string name="sign_out_confirm">Sensorer som du har verifierat äganderätten till på inställningssidan tas automatiskt bort från appen när du loggar ut. Sensordata hämtas från molnet igen om du loggar in med samma e-postadress.\n\nÄr du säker på att du vill logga ut? </string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">dBm</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 32033138f..370272a53 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,11 +58,11 @@
     <string name="cancel">Cancel</string>
     <string name="charts_background_dialog_description">Charts feature works best with background scanning enabled.</string>
     <string name="charts_background_dialog_title_question">Would you like to enable background scanning?</string>
-    <string name="claim_description">Do you own this sensor? If yes, please claim ownership of the sensor and it\'ll be added to your Ruuvi account. Every Ruuvi sensor can have only one owner.\n\nBenefits:\n\n ● Sensor names, background images, offsets and alert settings will be securely stored in the Cloud\n\n ● Access sensors remotely over the Internet (requires a Ruuvi Gateway)\n\n ● Share sensors with friends and family (requires a Ruuvi Gateway)\n\n ● Browse up to 2 years of history on station.ruuvi.com (requires a Ruuvi Gateway)</string>
+    <string name="claim_description">Do you own this sensor? If yes, please claim ownership of the sensor and it\'ll be added to your Ruuvi account. Every Ruuvi sensor can have only one owner.\n\nBenefits:\n\n ● Sensor names, background images, offsets and alert settings will be securely stored in the cloud\n\n ● Access sensors remotely over the Internet (requires a Ruuvi Gateway)\n\n ● Share sensors with friends and family (requires a Ruuvi Gateway)\n\n ● Browse up to 2 years of history on station.ruuvi.com (requires a Ruuvi Gateway)</string>
     <string name="claim_ownership">Claim Ownership</string>
     <string name="claim_sensor">Claim sensor</string>
     <string name="clear">Clear</string>
-    <string name="clear_confirm">Clear the historical data from the app?</string>
+    <string name="clear_confirm">Clear the local historical data from the app?</string>
     <string name="close">Close</string>
     <string name="confirm">Confirm</string>
     <string name="connected_reading_info">Synchronising...</string>
@@ -96,18 +96,18 @@
     <string name="help_about_text">Ruuvi Station is an easy-to-use but powerful tool to supercharge your Ruuvi sensors. Simply add some sensors and you\'re ready to go.</string>
     <string name="help_about_title">ABOUT / HELP</string>
     <string name="help_added_tags">Added sensors: %1$,d</string>
-    <string name="help_db_data_points">Stored measurements: %1$,d</string>
+    <string name="help_db_data_points">Number of locally stored measurements: %1$,d</string>
     <string name="help_db_size">Database size: %1$,d kB</string>
-    <string name="help_more_to_read_text">Ruuvi\'s website: ruuvi.com\nRuuvi Forum: f.ruuvi.com\nRuuvi Blog: blog.ruuvi.com\nRuuvi on Twitter: twitter.com/ruuvicom</string>
+    <string name="help_more_to_read_text">Ruuvi\'s website: ruuvi.com\nRuuvi Forum: f.ruuvi.com\nRuuvi Blog: ruuvi.com/blog\nRuuvi on Twitter: twitter.com/ruuvicom</string>
     <string name="help_more_to_read_title">MORE TO READ</string>
     <string name="help_opensource_text">Just like Ruuvi sensors, Ruuvi Station is also open-source: github.com/ruuvi</string>
     <string name="help_opensource_title">OPEN-SOURCE</string>
-    <string name="help_operations_text">We\'ve designed the app to be self-explanatory but comprehensive manuals are also available for both Ruuvi sensors and Ruuvi Station: ruuvi.com/manuals</string>
+    <string name="help_operations_text">We\'ve designed the app to be self-explanatory but comprehensive manuals are also available for both Ruuvi sensors and Ruuvi Station: ruuvi.com/support</string>
     <string name="help_operations_title">OPERATIONS MANUAL</string>
-    <string name="help_privacy_policy_text">By using the application, you accept Ruuvi\'s standard terms and conditions\nruuvi.com/terms</string>
+    <string name="help_privacy_policy_text">By using the application, you accept Ruuvi\'s standard terms and conditions: ruuvi.com/terms</string>
     <string name="help_privacy_policy_title">PRIVACY POLICY</string>
     <string name="help_seen_tags">Seen sensors: %1$,d</string>
-    <string name="help_troubleshooting_text">If you’re experiencing problems and our manuals didn’t provide the help you need, check out our many troubleshooting topics, here: ruuvi.com/troubles</string>
+    <string name="help_troubleshooting_text">If you’re experiencing problems and our manuals didn’t provide the help you need, check out our many troubleshooting topics, here: ruuvi.com/support</string>
     <string name="help_troubleshooting_title">TROUBLESHOOTING</string>
     <string name="hours">Hours</string>
     <string name="humidity">Humidity</string>
@@ -142,7 +142,7 @@
     <string name="name">NAME</string>
     <string name="navigation_drawer_close">Close the navigation drawer</string>
     <string name="navigation_drawer_open">Open the navigation drawer</string>
-    <string name="network_sharing_disabled">Only sensors within range of your Ruuvi Gateway can be shared. If you don\'t have one yet, get it on ruuvi.com</string>
+    <string name="network_sharing_disabled">Only sensors within range of your Ruuvi Gateway can be shared. If you don\'t have one yet, get it on ruuvi.com/gateway</string>
     <string name="network_status_title">Ruuvi cloud status</string>
     <string name="network_sync_result_exception">Synchronisation failed: %1$s</string>
     <string name="network_sync_result_not_logged">Synchronisation failed: need to log in first</string>
@@ -194,8 +194,8 @@
     <string name="sensor_settings">Sensor Settings</string>
     <string name="sensor_shared">Shared</string>
     <string name="settings">Settings</string>
-    <string name="settings_background_battery_optimization">If you experience any issues with background scanning you should disable battery optimization for Ruuvi Station. This procedure may vary depending on your device vendor, model and Android version.</string>
-    <string name="settings_background_battery_optimization_common_instructions">Go to Android Settings -> Apps -> Ruuvi Station -> Battery -> Battery Optimization and select \'Don\'t Optimise for Ruuvi Station\'</string>
+    <string name="settings_background_battery_optimization">If you experience any issues with background scanning you should disable battery optimisation for Ruuvi Station. This procedure may vary depending on your device vendor, model and Android version.</string>
+    <string name="settings_background_battery_optimization_common_instructions">Go to Android Settings -> Apps -> Ruuvi Station -> Battery -> Battery Optimisation and select \'Don\'t optimise for Ruuvi Station\'</string>
     <string name="settings_background_battery_optimization_huawei_instructions">On Huawei devices go to Android Settings -> Apps -> Ruuvi Station -> Power usage details -> App launch. Disable \'Manage Automatically\' and enable options: \'Auto-Launch\', \'Secondary Launch\' and \'Run in background\'.</string>
     <string name="settings_background_battery_optimization_samsung23_instructions">On Samsung devices go to Android Settings -> Battery -> App power saving detail and set option \'Turned off\' for Ruuvi Station.</string>
     <string name="settings_background_battery_optimization_samsung_instructions">On Samsung devices go to Android Settings -> Device Maintenance (or Device Care) -> Battery. Disable \'Put unused apps to sleep\'. Disable \'Auto-disable unused apps\'. Remove Ruuvi Station from the list of sleeping apps. Disable background restrictions for Ruuvi Station.</string>
@@ -236,14 +236,14 @@
     <string name="settings_temperature_unit_details">Choose the temperature unit you want to be displayed</string>
     <string name="share">Share</string>
     <string name="share_sensor_add_friend">Add friend</string>
-    <string name="share_sensor_already_shared">Already shared</string>
-    <string name="share_sensor_description">You can share the sensor with friends and family if it\'s in range of a Ruuvi Gateway.\n\nReceiver will be notified by email. If the receiver doesn\'t have a Ruuvi account, a free Ruuvi account will automatically be created at first log in.\n\nNote that the sensor\'s custom name and background image will be shared. The name and image sync is one time only, and they can be customised by the receiver. Offset values (if any) will be automatically synced, and the receiver will always see the corrected values.</string>
+    <string name="share_sensor_already_shared">Already shared %1$,d/%2$,d</string>
+    <string name="share_sensor_description">You can share the sensor with friends and family if it\'s in range of a Ruuvi Gateway.\n\nReceiver will be notified by email. If the receiver doesn\'t have a Ruuvi account, a free Ruuvi account will automatically be created at first log in.\n\nNote that the sensor\'s custom name and background image will be shared. The name and image sync is one time only, and after this, they can be privately customised by the receiver. Offset values (if any) set by the owner, will be automatically synced, and the receiver will always see the final corrected values.</string>
     <string name="share_sensor_send_button">Send</string>
     <string name="share_sensor_title">Share sensor</string>
     <string name="share_sensor_unshare_confirm">Do you want to unshare sensor for %1$s?</string>
     <string name="sign_in">Sign in</string>
     <string name="sign_in_benefits_description">After signing in, you will automatically be marked as the owner of your nearby Ruuvi sensors. The claimed sensors will be restored after an app re-install.\n\nWith a Ruuvi Gateway router, you\'ll be able to monitor the claimed sensors remotely and share them with your friends.</string>
-    <string name="sign_in_benefits_title">Benefits of the Ruuvi Cloud service</string>
+    <string name="sign_in_benefits_title">Benefits of the Ruuvi cloud service</string>
     <string name="sign_in_check_email">Check your email for an activation code.</string>
     <string name="sign_in_code_hint">Code</string>
     <string name="sign_in_email_sent">Email sent</string>
@@ -252,7 +252,7 @@
     <string name="sign_in_request_code">Request a code</string>
     <string name="sign_in_submit_button">Submit</string>
     <string name="sign_out">Sign out</string>
-    <string name="sign_out_confirm">When you sign out, sensors the ownerships of which you\'ve claimed on the sensor Settings page will be automatically removed from the app. When you sign in again using the same email address, the sensors will be returned from the Cloud.\n\n Do you want to sign out?</string>
+    <string name="sign_out_confirm">When you sign out, sensors the ownerships of which you\'ve claimed on the sensor Settings page will be automatically removed from the app. When you sign in again using the same email address, the sensors will be returned from the cloud.\n\nDo you want to sign out?</string>
     <string name="signal_reading">%1$,d %2$s</string>
     <string name="signal_reading_zero">- %1$s</string>
     <string name="signal_unit">dBm</string>

From d3d7d6000bedc4be47f7b7d6b44cf49b05091eba Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 15 Sep 2021 20:01:37 +0300
Subject: [PATCH 21/33] ISSUE #462 No FI string for Invalid E-Mail given error
 (sensor share) [ADDED] localization for different cloud errors

---
 .../data/response/RuuviNetworkResponse.kt     |  2 +-
 .../network/di/NetworkInjectionModule.kt      |  4 +-
 .../domain/NetworkResponseLocalizer.kt        | 62 +++++++++++++++++++
 .../network/domain/RuuviNetworkInteractor.kt  | 10 ++-
 app/src/main/res/values-fi/strings.xml        | 21 +++++++
 app/src/main/res/values-fr/strings.xml        | 20 ++++++
 app/src/main/res/values-ru/strings.xml        | 21 +++++++
 app/src/main/res/values-sv/strings.xml        | 21 +++++++
 app/src/main/res/values/strings.xml           | 21 +++++++
 9 files changed, 179 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/ruuvi/station/network/domain/NetworkResponseLocalizer.kt

diff --git a/app/src/main/java/com/ruuvi/station/network/data/response/RuuviNetworkResponse.kt b/app/src/main/java/com/ruuvi/station/network/data/response/RuuviNetworkResponse.kt
index da2b90792..cfb5ea940 100644
--- a/app/src/main/java/com/ruuvi/station/network/data/response/RuuviNetworkResponse.kt
+++ b/app/src/main/java/com/ruuvi/station/network/data/response/RuuviNetworkResponse.kt
@@ -2,7 +2,7 @@ package com.ruuvi.station.network.data.response
 
 data class RuuviNetworkResponse<T> (
     val result: String,
-    val error: String,
+    var error: String,
     val data: T?,
     val code: String?
 ) {
diff --git a/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt b/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
index 291426ba8..c48ede2ab 100644
--- a/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
+++ b/app/src/main/java/com/ruuvi/station/network/di/NetworkInjectionModule.kt
@@ -12,7 +12,7 @@ object NetworkInjectionModule {
 
         bind<NetworkTokenRepository>() with singleton { NetworkTokenRepository(instance(), instance(), instance()) }
 
-        bind<RuuviNetworkInteractor>() with singleton { RuuviNetworkInteractor(instance(), instance(), instance(), instance(), instance()) }
+        bind<RuuviNetworkInteractor>() with singleton { RuuviNetworkInteractor(instance(), instance(), instance(), instance(), instance(), instance()) }
 
         bind<NetworkSignInInteractor>() with singleton { NetworkSignInInteractor(instance(), instance(), instance()) }
 
@@ -45,5 +45,7 @@ object NetworkInjectionModule {
         bind<ClaimSensorViewModel>() with factory { sensorId: String ->
             ClaimSensorViewModel(sensorId, instance(), instance(), instance(), instance())
         }
+
+        bind<NetworkResponseLocalizer>() with provider { NetworkResponseLocalizer(instance()) }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/NetworkResponseLocalizer.kt b/app/src/main/java/com/ruuvi/station/network/domain/NetworkResponseLocalizer.kt
new file mode 100644
index 000000000..8849ead8f
--- /dev/null
+++ b/app/src/main/java/com/ruuvi/station/network/domain/NetworkResponseLocalizer.kt
@@ -0,0 +1,62 @@
+package com.ruuvi.station.network.domain
+
+import android.content.Context
+import com.ruuvi.station.R
+import com.ruuvi.station.network.data.response.RuuviNetworkResponse
+
+class NetworkResponseLocalizer (
+    val context: Context
+    ) {
+    fun localizeResponse(response: RuuviNetworkResponse<*>?) {
+        if (response?.isError() == true) {
+            response.error = when (response.code) {
+                ER_FORBIDDEN -> context.getString(R.string.cloud_er_forbidden)
+                ER_UNAUTHORIZED -> context.getString(R.string.cloud_er_unauthorized)
+                ER_INTERNAL -> context.getString(R.string.cloud_er_internal)
+                ER_INVALID_FORMAT -> context.getString(R.string.cloud_er_invalid_format)
+                ER_USER_NOT_FOUND -> context.getString(R.string.cloud_er_user_not_found)
+                ER_SENSOR_NOT_FOUND -> context.getString(R.string.cloud_er_sensor_not_found)
+                ER_TOKEN_EXPIRED -> context.getString(R.string.cloud_er_token_expired)
+                ER_SUBSCRIPTION_NOT_FOUND -> context.getString(R.string.cloud_er_subscription_not_found)
+                ER_SHARE_COUNT_REACHED -> context.getString(R.string.cloud_er_share_count_reached)
+                ER_SENSOR_SHARE_COUNT_REACHED -> context.getString(R.string.cloud_er_sensor_share_count_reached)
+                ER_NO_DATA_TO_SHARE -> context.getString(R.string.cloud_er_no_data_to_share)
+                ER_SENSOR_ALREADY_SHARED -> context.getString(R.string.cloud_er_sensor_already_shared)
+                ER_UNABLE_TO_SEND_EMAIL -> context.getString(R.string.cloud_er_unable_to_send_email)
+                ER_MISSING_ARGUMENT -> context.getString(R.string.cloud_er_missing_argument)
+                ER_INVALID_DENSITY_MODE -> context.getString(R.string.cloud_er_invalid_density_mode)
+                ER_INVALID_SORT_MODE -> context.getString(R.string.cloud_er_invalid_sort_mode)
+                ER_INVALID_TIME_RANGE -> context.getString(R.string.cloud_er_invalid_time_range)
+                ER_INVALID_EMAIL_ADDRESS -> context.getString(R.string.cloud_er_invalid_email_address)
+                ER_INVALID_MAC_ADDRESS -> context.getString(R.string.cloud_er_invalid_mac_address)
+                ER_SUB_DATA_STORAGE_ERROR -> context.getString(R.string.cloud_er_sub_data_storage_error)
+                ER_SUB_NO_USER -> context.getString(R.string.cloud_er_sub_no_user)
+                else -> response.error
+            }
+        }
+    }
+
+    companion object {
+        const val ER_FORBIDDEN = "ER_FORBIDDEN"
+        const val ER_UNAUTHORIZED = "ER_UNAUTHORIZED"
+        const val ER_INTERNAL = "ER_INTERNAL"
+        const val ER_INVALID_FORMAT = "ER_INVALID_FORMAT"
+        const val ER_USER_NOT_FOUND = "ER_USER_NOT_FOUND"
+        const val ER_SENSOR_NOT_FOUND = "ER_SENSOR_NOT_FOUND"
+        const val ER_TOKEN_EXPIRED = "ER_TOKEN_EXPIRED"
+        const val ER_SUBSCRIPTION_NOT_FOUND = "ER_SUBSCRIPTION_NOT_FOUND"
+        const val ER_SHARE_COUNT_REACHED = "ER_SHARE_COUNT_REACHED"
+        const val ER_SENSOR_SHARE_COUNT_REACHED = "ER_SENSOR_SHARE_COUNT_REACHED"
+        const val ER_NO_DATA_TO_SHARE = "ER_NO_DATA_TO_SHARE"
+        const val ER_SENSOR_ALREADY_SHARED = "ER_SENSOR_ALREADY_SHARED"
+        const val ER_UNABLE_TO_SEND_EMAIL = "ER_UNABLE_TO_SEND_EMAIL"
+        const val ER_MISSING_ARGUMENT = "ER_MISSING_ARGUMENT"
+        const val ER_INVALID_DENSITY_MODE = "ER_INVALID_DENSITY_MODE"
+        const val ER_INVALID_SORT_MODE = "ER_INVALID_SORT_MODE"
+        const val ER_INVALID_TIME_RANGE = "ER_INVALID_TIME_RANGE"
+        const val ER_INVALID_EMAIL_ADDRESS = "ER_INVALID_EMAIL_ADDRESS"
+        const val ER_INVALID_MAC_ADDRESS = "ER_INVALID_MAC_ADDRESS"
+        const val ER_SUB_DATA_STORAGE_ERROR = "ER_SUB_DATA_STORAGE_ERROR"
+        const val ER_SUB_NO_USER = "ER_SUB_NO_USER"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
index 129003913..0a6a0b94a 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
@@ -20,7 +20,8 @@ class RuuviNetworkInteractor (
     private val networkRepository: RuuviNetworkRepository,
     private val networkRequestExecutor: NetworkRequestExecutor,
     private val sensorSettingsRepository: SensorSettingsRepository,
-    private val firebaseInteractor: FirebaseInteractor
+    private val firebaseInteractor: FirebaseInteractor,
+    private val networkResponseLocalizer: NetworkResponseLocalizer
 ) {
     val signedIn: Boolean
         get() = getToken() != null
@@ -42,6 +43,7 @@ class RuuviNetworkInteractor (
 
     fun verifyUser(token: String, onResult: (UserVerifyResponse?) -> Unit) {
         networkRepository.verifyUser(token) { response ->
+            networkResponseLocalizer.localizeResponse(response)
             response?.let {
                 if (response.error.isNullOrEmpty() && response.data != null) {
                     tokenRepository.saveTokenInfo(
@@ -68,6 +70,7 @@ class RuuviNetworkInteractor (
     fun getUserInfo(onResult: (UserInfoResponse?) -> Unit) {
         ioScope.launch {
             val result = getUserInfo()
+            networkResponseLocalizer.localizeResponse(result)
             withContext(Dispatchers.Main) {
                 onResult(result)
             }
@@ -98,6 +101,7 @@ class RuuviNetworkInteractor (
                 val request = ClaimSensorRequest(sensorSettings.id, sensorSettings.displayName)
                 try {
                     networkRepository.claimSensor(request, token) { claimResponse ->
+                        networkResponseLocalizer.localizeResponse(claimResponse)
                         if (claimResponse?.isSuccess() == true) {
                             sensorSettingsRepository.setSensorOwner(
                                 sensorSettings.id,
@@ -145,6 +149,7 @@ class RuuviNetworkInteractor (
             token?.let {
                 val request = ShareSensorRequest(recipientEmail, tagId)
                 val response = networkRepository.shareSensor(request, token)
+                networkResponseLocalizer.localizeResponse(response)
                 withContext(Dispatchers.Main) {
                     onResult(response)
                 }
@@ -158,6 +163,7 @@ class RuuviNetworkInteractor (
             token?.let {
                 val request = UnshareSensorRequest(recipientEmail, tagId)
                 val response = networkRepository.unshareSensor(request, token)
+                networkResponseLocalizer.localizeResponse(response)
                 withContext(Dispatchers.Main) {
                     onResult(response)
                 }
@@ -170,6 +176,7 @@ class RuuviNetworkInteractor (
         CoroutineScope(Dispatchers.IO).launch(handler) {
             token?.let {
                 val response = networkRepository.getSensors(sensorId, it)
+                networkResponseLocalizer.localizeResponse(response)
                 if (response?.isSuccess() == true && response.data != null) {
                     val result = response.data.sensors.firstOrNull { it.sensor == sensorId }
                     withContext(Dispatchers.Main) {
@@ -222,6 +229,7 @@ class RuuviNetworkInteractor (
             token?.let {
                 val request = UploadImageRequest(tagId, "image/jpeg")
                 val response = networkRepository.uploadImage(filename, request, token)
+                networkResponseLocalizer.localizeResponse(response)
                 withContext(Dispatchers.Main) {
                     onResult(response)
                 }
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b6c3c8bfe..be884846f 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -63,6 +63,27 @@
     <string name="clear">Pyyhi</string>
     <string name="clear_confirm">Tyhjennetäänkö sovellukseen paikallisesti tallennetut historiatiedot?</string>
     <string name="close">Sulje</string>
+    <string name="cloud_er_forbidden">Kielletty</string>
+    <string name="cloud_er_internal">Sisäinen virhe</string>
+    <string name="cloud_er_invalid_density_mode">Virheellinen tiheuden tila</string>
+    <string name="cloud_er_invalid_email_address">Virheellinen sähköpostiosoite</string>
+    <string name="cloud_er_invalid_format">Virheellinen pyynnön muoto</string>
+    <string name="cloud_er_invalid_mac_address">Virheellinen MAC-osoite</string>
+    <string name="cloud_er_invalid_sort_mode">Virheellinen lajittelun tila</string>
+    <string name="cloud_er_invalid_time_range">Virheellinen aikaväli</string>
+    <string name="cloud_er_missing_argument">Argumentti puuttuu</string>
+    <string name="cloud_er_no_data_to_share">Jotta voit jakaa anturin, sen täytyy olla Ruuvi Gateway -reitittimen kuuluvuusalueella</string>
+    <string name="cloud_er_sensor_already_shared">Tämä anturi on jo jaettu</string>
+    <string name="cloud_er_sensor_not_found">Anturia ei löydy</string>
+    <string name="cloud_er_sensor_share_count_reached">Et voi jakaa anturia useammalle käyttäjälle</string>
+    <string name="cloud_er_share_count_reached">Jakojen enimmäismäärä on ylitetty</string>
+    <string name="cloud_er_sub_data_storage_error">Tallennusvirhe</string>
+    <string name="cloud_er_sub_no_user">Ei käyttäjää</string>
+    <string name="cloud_er_subscription_not_found">Tilausta ei löydy</string>
+    <string name="cloud_er_token_expired">Avain on vanhentunut</string>
+    <string name="cloud_er_unable_to_send_email">Sähköpostin lähetys epäonnistui</string>
+    <string name="cloud_er_unauthorized">Ei sallittu</string>
+    <string name="cloud_er_user_not_found">Käyttäjää ei löydy</string>
     <string name="confirm">Vahvista</string>
     <string name="connected_reading_info">Synkronoidaan...</string>
     <string name="connecting">Yhdistetään...</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ff078dd69..583ee375b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -60,6 +60,26 @@
     <string name="clear">Effacer</string>
     <string name="clear_confirm">Supprimer l\'historique de l\'application ?</string>
     <string name="close">Fermer</string>
+    <string name="cloud_er_forbidden">Interdit</string>
+    <string name="cloud_er_internal">Erreur interne</string>
+    <string name="cloud_er_invalid_density_mode">Mode de densité invalide</string>
+    <string name="cloud_er_invalid_email_address">Adresse email invalide</string>
+    <string name="cloud_er_invalid_format">Format incorrect</string>
+    <string name="cloud_er_invalid_mac_address">Adresse MAC invalide</string>
+    <string name="cloud_er_invalid_sort_mode">Mode de tri invalide</string>
+    <string name="cloud_er_invalid_time_range">Intervalle invalide</string>
+    <string name="cloud_er_missing_argument">Argument manquant</string>
+    <string name="cloud_er_sensor_already_shared">Ce capteur est déjà partagé</string>
+    <string name="cloud_er_sensor_not_found">Capteur introuvable</string>
+    <string name="cloud_er_sensor_share_count_reached">Vous ne pouvez pas partager le capteur à d\'avantage d\'utilisateurs</string>
+    <string name="cloud_er_share_count_reached">Le nombre de partages maximum est atteint</string>
+    <string name="cloud_er_sub_data_storage_error">Erreur d\'enregistrement</string>
+    <string name="cloud_er_sub_no_user">Pas d\'utilisateur</string>
+    <string name="cloud_er_subscription_not_found">L\'abonnement est introuvable</string>
+    <string name="cloud_er_token_expired">Le code est perimé</string>
+    <string name="cloud_er_unable_to_send_email">Impossible d\'envoyer l\'email</string>
+    <string name="cloud_er_unauthorized">Non permis</string>
+    <string name="cloud_er_user_not_found">Utilisateur introuvable</string>
     <string name="confirm">Confirmer</string>
     <string name="connected_reading_info">Synchronisation...</string>
     <string name="connecting">Connexion...</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2f42e7365..48228a883 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -60,6 +60,27 @@
     <string name="clear">Очистить</string>
     <string name="clear_confirm">Вы уверены что хотите удалить всю историю наблюдений? Данное действие невозможно отменить.</string>
     <string name="close">Закрыть</string>
+    <string name="cloud_er_forbidden">Запрещено</string>
+    <string name="cloud_er_internal">Внутренняя ошибка</string>
+    <string name="cloud_er_invalid_density_mode">Недопустимый режим плотности</string>
+    <string name="cloud_er_invalid_email_address">Недопустимый e-mail</string>
+    <string name="cloud_er_invalid_format">Неправильный формат запроса</string>
+    <string name="cloud_er_invalid_mac_address">Недопустимый MAC-адрес</string>
+    <string name="cloud_er_invalid_sort_mode">Выбран недопустимый метод сортировки</string>
+    <string name="cloud_er_invalid_time_range">Выбран недопустимый промежуток времени</string>
+    <string name="cloud_er_missing_argument">Пропущен аргумент запроса</string>
+    <string name="cloud_er_no_data_to_share">Чтобы поделиться датчиком необходимо наличие Ruuvi Gateway поблизости</string>
+    <string name="cloud_er_sensor_already_shared">Вы уже делились этим сенсором</string>
+    <string name="cloud_er_sensor_not_found">Сенсор не найден</string>
+    <string name="cloud_er_sensor_share_count_reached">Превышено количество общих сенсоров</string>
+    <string name="cloud_er_share_count_reached">Достигнут лимит количества общих сенсоров</string>
+    <string name="cloud_er_sub_data_storage_error">Ошибка сохранения данных</string>
+    <string name="cloud_er_sub_no_user">Нет пользователя</string>
+    <string name="cloud_er_subscription_not_found">Подписка не найдена</string>
+    <string name="cloud_er_token_expired">Токен истек</string>
+    <string name="cloud_er_unable_to_send_email">Не удалось отправить e-mail</string>
+    <string name="cloud_er_unauthorized">Требуется авторизация</string>
+    <string name="cloud_er_user_not_found">Пользователь не найден</string>
     <string name="confirm">Подтвердить</string>
     <string name="connected_reading_info">Обмениваюсь...</string>
     <string name="connecting">Соединение...</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 51ac7d8e5..534d3d703 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -63,6 +63,27 @@
     <string name="clear">Rensa</string>
     <string name="clear_confirm">Radera historisk data från appen?</string>
     <string name="close">Stäng</string>
+    <string name="cloud_er_forbidden">Förbjuden</string>
+    <string name="cloud_er_internal">Internt fel</string>
+    <string name="cloud_er_invalid_density_mode">Ogiltig densitet</string>
+    <string name="cloud_er_invalid_email_address">Ogiltig e-postaddress</string>
+    <string name="cloud_er_invalid_format">Ogiltigt förfrågningsformat</string>
+    <string name="cloud_er_invalid_mac_address">Ogiltig MAC-address</string>
+    <string name="cloud_er_invalid_sort_mode">Ogiltig sortering</string>
+    <string name="cloud_er_invalid_time_range">Ogiltigt intervall</string>
+    <string name="cloud_er_missing_argument">Argument saknas</string>
+    <string name="cloud_er_no_data_to_share">För att dela sensorn måste du ha en Ruuvi Gateway router i närheten av sensorn</string>
+    <string name="cloud_er_sensor_already_shared">Sensorn är redan delad</string>
+    <string name="cloud_er_sensor_not_found">Sensorn hittades inte</string>
+    <string name="cloud_er_sensor_share_count_reached">Du kan inte dela sensorn med flera användare</string>
+    <string name="cloud_er_share_count_reached">Maximal delning har överskridits</string>
+    <string name="cloud_er_sub_data_storage_error">Datalagringsfel</string>
+    <string name="cloud_er_sub_no_user">Ingen användare</string>
+    <string name="cloud_er_subscription_not_found">Prenumerationen hittades inte</string>
+    <string name="cloud_er_token_expired">Nyckeln har upphört att gälla</string>
+    <string name="cloud_er_unable_to_send_email">Kunde inte skicka e-post</string>
+    <string name="cloud_er_unauthorized">Obehörig</string>
+    <string name="cloud_er_user_not_found">Användaren hittades inte</string>
     <string name="confirm">Bekräfta</string>
     <string name="connected_reading_info">Synkroniserar...</string>
     <string name="connecting">Ansluter...</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 370272a53..1aea1fd50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,6 +64,27 @@
     <string name="clear">Clear</string>
     <string name="clear_confirm">Clear the local historical data from the app?</string>
     <string name="close">Close</string>
+    <string name="cloud_er_forbidden">Forbidden</string>
+    <string name="cloud_er_internal">Internal error</string>
+    <string name="cloud_er_invalid_density_mode">Invalid density mode</string>
+    <string name="cloud_er_invalid_email_address">Invalid e-mail address</string>
+    <string name="cloud_er_invalid_format">Invalid request format</string>
+    <string name="cloud_er_invalid_mac_address">Invalid MAC-address</string>
+    <string name="cloud_er_invalid_sort_mode">Invalid sort mode</string>
+    <string name="cloud_er_invalid_time_range">Invalid time range</string>
+    <string name="cloud_er_missing_argument">Missing argument</string>
+    <string name="cloud_er_no_data_to_share">In order to share the sensor, you need to have a Ruuvi Gateway router nearby the sensor</string>
+    <string name="cloud_er_sensor_already_shared">This sensor is already shared</string>
+    <string name="cloud_er_sensor_not_found">Sensor not found</string>
+    <string name="cloud_er_sensor_share_count_reached">Sensor share limit is reached</string>
+    <string name="cloud_er_share_count_reached">The share limit is reached</string>
+    <string name="cloud_er_sub_data_storage_error">Data storage error</string>
+    <string name="cloud_er_sub_no_user">No user</string>
+    <string name="cloud_er_subscription_not_found">Subscription is not found</string>
+    <string name="cloud_er_token_expired">Token is expired</string>
+    <string name="cloud_er_unable_to_send_email">Unable to send e-mail</string>
+    <string name="cloud_er_unauthorized">Unauthorised</string>
+    <string name="cloud_er_user_not_found">User not found</string>
     <string name="confirm">Confirm</string>
     <string name="connected_reading_info">Synchronising...</string>
     <string name="connecting">Connecting...</string>

From 68b16edec0f2bcced6819834a28a7a099563543f Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 15 Sep 2021 20:33:44 +0300
Subject: [PATCH 22/33] ISSUE #482 Force capital letters when typing the one
 time code

---
 app/src/main/res/layout/fragment_enter_code.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_enter_code.xml b/app/src/main/res/layout/fragment_enter_code.xml
index 2324c0da5..233264350 100644
--- a/app/src/main/res/layout/fragment_enter_code.xml
+++ b/app/src/main/res/layout/fragment_enter_code.xml
@@ -62,7 +62,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/montserrat"
             android:hint="@string/sign_in_code_hint"
-            android:inputType="textEmailAddress"
+            android:inputType="textCapCharacters"
             android:textColor="@color/white" />
     </com.google.android.material.textfield.TextInputLayout>
 

From f672ffdd7600f287025aaaccd9fe33852a901cbe Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 15 Sep 2021 20:44:25 +0300
Subject: [PATCH 23/33] ISSUE #481 Auto capitalise when renaming sensors

---
 app/src/main/res/layout/dialog_sensor_name_edit.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/dialog_sensor_name_edit.xml b/app/src/main/res/layout/dialog_sensor_name_edit.xml
index af6be8678..7debb90cf 100644
--- a/app/src/main/res/layout/dialog_sensor_name_edit.xml
+++ b/app/src/main/res/layout/dialog_sensor_name_edit.xml
@@ -9,7 +9,7 @@
         android:id="@+id/sensorNameEditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="text"
+        android:inputType="textCapWords"
         android:maxLength="32"
         android:layout_marginStart="@dimen/dialog_margin"
         android:layout_marginEnd="@dimen/dialog_margin"

From c67e5900df730f3bddd580545929df7add7126f4 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Wed, 15 Sep 2021 20:45:52 +0300
Subject: [PATCH 24/33] version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 030698343..859698fec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15041
-        versionName "1.5.41"
+        versionCode 15042
+        versionName "1.5.42"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

From e490ff56ef6de2fab0df7855dee5f65e5ef2bc7f Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Thu, 16 Sep 2021 19:27:15 +0300
Subject: [PATCH 25/33] ISSUE #420 Unification: Ruuvi logo

---
 .../ruuvi/station/about/ui/AboutActivity.kt   |   2 +-
 .../station/dashboard/ui/DashboardActivity.kt |   2 +-
 .../tagdetails/ui/TagDetailsActivity.kt       |   2 +-
 .../res/drawable-nodpi/ruuvi_logo_nega.png    | Bin 8474 -> 0 bytes
 app/src/main/res/drawable/logo_2021.xml       |   9 ++
 app/src/main/res/drawable/logo_white.xml      |  84 ------------------
 app/src/main/res/drawable/splash.xml          |   9 +-
 app/src/main/res/layout/activity_welcome.xml  |   2 +-
 app/src/main/res/layout/drawer_header.xml     |   2 +-
 app/src/main/res/values-de/strings.xml        |   3 +
 app/src/main/res/values-fi/strings.xml        |   2 +-
 app/src/main/res/values-fr/strings.xml        |   2 +-
 app/src/main/res/values-ru/strings.xml        |   2 +-
 app/src/main/res/values-sv/strings.xml        |   2 +-
 app/src/main/res/values/strings.xml           |   2 +-
 15 files changed, 26 insertions(+), 99 deletions(-)
 delete mode 100644 app/src/main/res/drawable-nodpi/ruuvi_logo_nega.png
 create mode 100644 app/src/main/res/drawable/logo_2021.xml
 delete mode 100644 app/src/main/res/drawable/logo_white.xml
 create mode 100644 app/src/main/res/values-de/strings.xml

diff --git a/app/src/main/java/com/ruuvi/station/about/ui/AboutActivity.kt b/app/src/main/java/com/ruuvi/station/about/ui/AboutActivity.kt
index 16db096bb..2eeea1513 100644
--- a/app/src/main/java/com/ruuvi/station/about/ui/AboutActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/about/ui/AboutActivity.kt
@@ -38,7 +38,7 @@ class AboutActivity : AppCompatActivity(), KodeinAware {
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.title = null
-        supportActionBar?.setIcon(R.drawable.logo_white)
+        supportActionBar?.setIcon(R.drawable.logo_2021)
 
         infoText.movementMethod = LinkMovementMethod.getInstance()
         operationsText.movementMethod = LinkMovementMethod.getInstance()
diff --git a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt
index eb1b2f439..b096b1fb2 100644
--- a/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/dashboard/ui/DashboardActivity.kt
@@ -67,7 +67,7 @@ class DashboardActivity : AppCompatActivity(), KodeinAware {
         permissionsInteractor = PermissionsInteractor(this)
 
         supportActionBar?.title = null
-        supportActionBar?.setIcon(R.drawable.logo)
+        supportActionBar?.setIcon(R.drawable.logo_2021)
 
         setupViewModel()
         setupDrawer()
diff --git a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
index e3cfbe4a7..f9dcc97c9 100644
--- a/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/tagdetails/ui/TagDetailsActivity.kt
@@ -142,7 +142,7 @@ class TagDetailsActivity : AppCompatActivity(), KodeinAware {
         setSupportActionBar(toolbar)
 
         supportActionBar?.title = null
-        supportActionBar?.setIcon(R.drawable.logo_white)
+        supportActionBar?.setIcon(R.drawable.logo_2021)
 
         noTagsTextView.setDebouncedOnClickListener { AddTagActivity.start(this) }
 
diff --git a/app/src/main/res/drawable-nodpi/ruuvi_logo_nega.png b/app/src/main/res/drawable-nodpi/ruuvi_logo_nega.png
deleted file mode 100644
index e8881d5bd09bf77f493109e0bf67db828752531d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8474
zcmV+#A?4nQP)<h;3K|Lk000e1NJLTq00Hy>003nO1^@s6yPFZ%00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru;tL5CD-8InzH0ygAOJ~3
zK~#9!?VWenRmHW&f9s<NQY--rVpnXjH|!c)Y-kMj8cj4BjW@YBYT`9|6OHD^c-0gu
z7<-F7MloJRqhb_9ED=OhKt)ibBlUalAA7hGgzvOHvuE$K-{<)rpGVF)Gqa|=v(~I)
zL<mVM0IL8!fG$h?^90}>Gn-F|kaN-vXb(&^GiBVD&Oj%i)y$?9T<*&O>$-i=4VVE;
z2F9D&!oV`$3D^MW4Hz&J7!SM#j0)Kw&tu&h*aBD^SRR-Sd<2XJhMC!{K>b(~*x$*0
zBcP{~`$XUqU?lJu@Uoe;mZwyStT#?CN&O{VB<Vg$BPGpKWz3TFfTZ06^|QUC10?-X
z(*L@Cj*&D<(hy0vNcy3q-bEo1N#B-qzoZW&wJst5$&#Lxbe^PM0s7NJ(hnp(BWcnS
zeOc({;z3ELNa|hy`F~B)*^*v%<69c$y0v(UBYj_e*+$YGZqK!ak0f0dVm){oX9r0?
zmh?`Aan6_YsHFWp_NA|+L2b<al9(vz5~m22C=qni>@VrJlHO1{cv8~3p8DI)5%r`h
z`?65d-I6xU@f@90!+0fWj-;!75UHe&k}j0=MGgI#Ea_ZH?Q<x5lXRM-sWt9_agzF_
z+?SOk4P44)t{V9tmNU6;E9vbz&YnR|i%zQ_>$ppFYn^A|WOpfPSF%l;d#tylttIUu
zX+KFvNIKd5_drQ|x;3$Zq>iQ3zAD5`C0*fel0NX6q<zyicS(As&i>4jbb8L_sJo;m
z8kmFkC2f&ne^!??qJjPlk+fQl<lkA+V-4<u-%4spX}^wcpdSk*eJ>|+-&@l32F5x$
z4NIY<JtTda(s}r_q_35{qaKnDm-I_X_edHpX?BgWT;ME#k4w77UAQ-CR)Ov>>F)}I
zxoMf;-A(zu6#Deb9Fh5pDU5e&8l*014fmYUD8@)yJqPmd<g~psaCHh~p2o#{fuw^Y
zmwO*cGg27qEJ=Ge(2wJ*d}^!(Z%bOW$@pe@N&O^U<&=R|k9_lqyCj?`Y3-s5cHfi;
zqE>v`sBqo;@mneO>GT}T*I!Z`??;Vj#?B-*IK}?FEU81}^1mkKeQ;)-{a8WLyD9c#
zlB884m3g}cEO1N1Oi5eT(T`o-vy~6L;M2b%l6h=#GQ7S)OG~2|D(M_aJ&PpVwNfw}
zHi~;29K)|t?$0bq8$>*3M|+rqdm8A^86Ns`LB#Uku?FX-YB9Z@w_QmCJjni<NacR0
zhq1m<i|>ZB1b*uIJiMu(M81kMrH@lwnCtu?cFy}P>FkuuSB;`o()JCQdgpoQ)7_EI
z+j5dV_B0PW*3qAik|ucQ%QQ(VMmh)2dXoP&HTL7{9xfJ(F0?B}DEFs4$^E1n`fz`s
zGw~Y*BJ$NFU9QSe7ct;@Nry<XQ1VH`fo3(}8Q>bAYXoy{z>#%+_XmIv^K5^`8Pe7t
z@b$)gMjhWd8t~!B)*Uz@!oz8Ez*p$yi8XrqpPt5fuoNs0d?zxwZwB}xxl^j_!w$f=
z0uA}Hkfh>i&Q^EUhOxkTZe7KWU4Tb`;qn;fm>Qu=+65Tq@ldK4d)E2AV?Fh!UBJy-
z3-<H)+w~lnhj{EyzeqQ{FRTD;R>S8H_1Kp)((t}d5ofuJzn3{xb@AZ8@YshXu>(nh
znmiJDdr9YzB+)q)$YU7UmcSEA@)xY@v!Rv-1bv3n%wtR>v9+YGHI8QmlFU%PuvLU|
zTF2vWuUUsyu#w09Y#gEdeOqmMRJrzh0c(2f#|FT@F$ml}z4)}&v;(%S(1$fLkVpR<
zlKIZSP~a*OD_h=iFz}|5+!|h-6<g{Q^o775@nfD&Yg5&FK=tt4rx?9`V|!Qj89TdD
zDgR8@W-M{(-{Gt2q|-*FXQTb`^Ssd(4vEZ4Qb{Yn82G!>Zi|HFNvt!&+|y6Cgf8jV
zu0ye-TaBOheFKa!e56Z+i@llT-#L<gEC|p>zpUe;oyF+P2;{kA2E$*4+MZytnxoz%
zmfwpqxb%d?X2465j?awHo#*ViIT2W`#an!*ON^0FVoQ(ea}L@^m=ZIV{(KDhF1XVH
zI632SeuKpP?;GPP{Cl5_#@~mCA?YBJLO;9G9Ow$%Ch2A+#gD=fx}={2XXi**AD4ul
z8$xN;If&vyWoDlPZwF}VyBT|1pBA8v*}(7$pUEmMYY!rYr0)O^Whk30aWe3<q=x6G
zrAlF+3S68c0ZjuYMMfqu7EEX+4ZWrdY!hCn?hVk!2Ebk!5k^lSMA4Z0%xrF?`z}hK
zCrRf410y_-LZUD5Y@@|~TB;ECZoqYf3$aK8FV<1B+xKFM@ja*{^iuwdFc1h)&pa#V
zxRVJJ@>ES`wiy}8V0vUk-cHiBz~z(x*p%d5z3zG#Efoa53UF5rZ%z+JNG35}h{`wR
zlF*aIX*M2sGC)&@ht7BH%>3UC(9|g4g(^NbHlu0&AR;n1rzn2E<nez&FW@Ojb%pS@
zR1o;>z#2Id$P}QST;k299Y#ecE~LiyrKh~WG_GAXijIWO+P5cR9Kvp@(lYpJ26NjA
zycyA2yEM=xE05?2{I#A+k!_L8_lP7JM2)!E%<3^M`6k>L3B6sD^(8hdNo<y{M}dg}
z+6jG-hj50Q2i#iaXCKL6ZihSP#~3c}KLCDO@^+h84;WNy4T_d!2z)j2`L6LW@cT#!
zH%60tOqUERNE^BBkD1K}ZVAxTCX#}LCQ14lVbU%?VrG-7l=DAH%<~~}PYi2J(viUL
zO1`cNn*$HjQj=j>AN(KU%&gTG9t4gvv(`xa*HW&}w)c7y&VeGFhXKG(0$esu1D+2s
zo|6d^t~j8^&tDH*8E8(Y12;!N=6y(>b@Jk1J;trkF~9_p=&2bb*2FF(nI3zRq^#Zu
z*o4{>npMJHz$L)>brHIxt%0L*L<CcS3xMk*CUeMFlt58Y&Ov4E@f}Ie0eg6Es=uUj
z%xsEB0x`mP)sLfghr&OQRCioIK>sc`v(GXn^G+n8k==5%9VVIC$u*3zJ+Qqa;R8sD
zFQswj{6x}VGkc;Qjpdg)IQSNj<oW$KU~MzIHgYmAHS{>hww#0N5W+dGGjP1;Hg?Bv
z!JkFAxz_W?%;q^o#5cwQS4Xg>t|otZ*>{q(R}FKzz|4l2*{{rOH+NaPh{mHDT7X+z
z5vA%6I7!<92Sp~-iO%dX(3u?$1$vm-?q+tina#+_;wZJlat`u>`$;TczTw+BE`)a8
z>dvNmtReT{_dWRwpud^T&R9D?lrWBoKJeqZ4;!=h&FmMzhQKMnI}P+>72wuNnHHDS
zSk8(-fNzl$f7uUM(acsev)#<>R5SavnLT1=({gy&m)c=T==l(m*%!ba0h-!EQeRIb
z@-^Vw0mks8nT>1U`#;7{{C_KOqL~fNn9REX*W`FR>{qL&`BL`Nd^5Y5Byr4Hz|=Z_
zYH#3}sz}Bqd&uhTd;v)Un{CbP>t=S5nf=WZac6~+(91c<6K)FBjxR0xM4(fE{tsy6
z%VxF!=tsKI1v8yy{^tnR(a(Xka=Z^Zy7@`tqP)<|{s3(3_^uvYA*p*c2VAHPuq2)W
zwlK3}&Foc*i&8r*=O8z0!puehuLNl7sJ0HM2rmkYV-hLEl$+UH=X`Z8Ft@><dmHF$
zW)Eh)hFrbx9~I!-*eB(^HPOtDB{9R-`W&)4$-8_-Lhm0~NYjC%%xqsXdz<2;)DFuz
zD7Eyjq6-zwh;<OjZX_W@zHzH_ZcFQ+{|(7|>kZVNSN}5-AET|z?5#-F&s9WP5T-_W
zaprSo_#J@vYy9fjk~UuE0q2U!?-)=(?*TiT*}XImN;1h_TP>|5wc$<@^Q~{3k@D|_
za=;px`T{i@Z)T?hn*qNfsSn=ThEnt>a1yYN^D&wi!@_aC5&INmA8aDYOJN^(`Pu~-
zQN!0d06%MsWDW~>*o`7F3B48Bq*=~?KksP9#4>T;u*_xx_l3}aByE!tk*rJ@XSnBm
zS{BW0l$l*%W?KW@fo(`qaUVhw=e!=Ul9}~0vs=w<R%FZPf&y)Y4tT63Z)Oun@;<y&
z!`F_HwC=JFxIF?1=2PHcGyAj&&&QHX$_q~(kvHeK6G&p*iy{}yY?he~H?ybA>@Q|E
z*o8zznR`Rhmc$qS+$g$xp5tl2!N5PO{7QS^-@igKF0O6200L<RzGY_bmV{NJyj0~z
zOMj6hl+-tlbs<i%TnyU6v_O`NyyB+?Jny;%*lUx4Zvr1z`IS>8t-9m^w;`}<0D)X*
zW-m1HA}`6LoP)e#K!7&7(_q-Fq@79Lo_*u4tdq6G3isr3SOJF?B!t?`#*;XSE~w(;
zok(gG{L2BiMSy-zWEqe6C7F~6sc@Des0+8zcsNxxI4$GvSBsm<C9zB#O_*Xhp)onw
zA!YU)ZG@&RffJV`nN0)q@x~k^iSg}}6(gZH8^M)v==B{ip8*dAXlh4S9I778a0TFq
z0DXMj%!ZY`y-b`?z%k9C{_Jk`;&Na}6`$MG`7HcD$!r{eC<m15Jj%m6raqNk?r|e_
z=eXm6<pcEZhH@z^^HQ}TVZ)z8;WaZ`7_vd<@OV1anck0G{D50CfG|GD!+LB&LT~4J
zQ7R(&ml}Fwc$y@Cgl`-tscRkI3t?^#mE%6I=ua`NewpOMH?uc@YpeL^(Tfwh?{u$&
z@^Zl}HT1%xB=p8KhJgW^>Q0TB<0S1!7+;|K&1@<qmW6K=bX-qo*!E>4CjYjuma~oo
zA@p(OI*<17j>!aFYUuIHbRgB402{@b5o+g9I>WVfsp<&qT)?4C2OiJxB0YiXo~-wT
zBsjgJ=RV~niA+;z=#}c~7L?G-H}nP%7fFwkWGnNDtt4$*jq{l+>=L3%<Y?fz4EAXU
zk}PrCkc1bn0L%bB2Sx&KxlpI9u@hl@7((NIGn<ofAFd!tkK9s$&~I#y{}6+`#A`O2
z$-NoLtu(o(qop1apq<mJ)Vz-+De&SO18VdMX_UzO0^cWjm+n&Gv!j6rfZv(fM;Wb)
zy$X0<v;tQ~aFPB%(z6w0yyv1r-8Z2xphQU~acJn}95jx<Qhg??MsQ4(WmQ9%+vk&R
zz4Ermd1Xm=kc2FqROMx5L*P7Mw4{q9WpP>Gs(@$q17`MSBz?KH!oT;D)H?*B&o4Ff
zrqs|Cnf&ugpmE(m%oYHD3eZ$n;J6Cpw;ix`fWG|2%svS~=4%5luvi#Ujpz(q4BRWJ
zUErm$QNfn_T;S&s_2<DVl;b`vcn)34k%r!Egx-wgR?a~>7#QdRc6tQbIRwa~;Zmj!
zBAvV--*&_v=HN`;`PVPlS#hDyYI=2Cq^D6ie6CMRfJ0?rPA0I_(6e2zrO7=fYue1l
z0M7)F&z9~jd1)lljm6?`J>o;)i2&_fpR$&F-qOlzdcwLSB}R*azZ1dR`BG3Rd~U-K
zhq@?H5_);5Dw2i{;X=5UrKKN3fC^Z^&AzjQN!p9V`7KR!U@7G_J)uv5&gpl6!$W6=
zs}hxpoAqf4aIm-LWFkv4DSn?y4Lv>F4}2CtMn_3nX(|8zdx6e`5YBME#&T$&@YEg!
zA@d2q0j_pIj2Kzr-&buZHRz@#^p*(a*_!h)H_Zjf%;pg$4QgkSJnf5Xv|9t)1!(&z
z_q^a!JMRb_>gnfu6UJGsTLJdUXkZUBdoSWXj-~Caaa}{ap_eE%^m5F_oP(^)?nTNB
zw=sSbvTRZkdPNKZb}+NiQ6FB(GeBFJSG$#O=%t2U&OveERh}+J_oV>i*i6!{PNVHY
z{b60T;4|Ri0PXbh{QDui&+|&?(}8~j4$M)G{^?n3=p~_-gkH`;aW5F5we+J&3b^>j
zZDuw%KszgV{{5~2#?UoqYj!S46|>FE>}pqdC{LG=lF-Y;I~Qb9I>qG=_f$A!(!vpv
zdJ@JN4g$oUJNQoQ)jq%&<^^7J^%C&Az@@-?W_G5TeVD`jHmj|9Xiteo7fDGb>CQpB
zCK_{$j)}Di)NH1tdjb&ca=>qZ9RtkE5Hou#&>HZ426qfFh8cnP&6OmnQ1=4%An`-!
z;r<rwsi`Dh>#qUBfWg%i`^f=1w>1y#OAWng3Dh^4EQoNe#5M=MlW~NKrM)qb=6q71
z@!Sw_4frP95K7z3!270~nY{tL0bKJh2S^g)I4x&p^qR)r#=lJuVRA3y(Bp(}La&ER
zn$6_yo6v*QQ82StfZ+w%7t?@y3q<H4GPs4-&{t?<Elw#gnM2$DBQwhS&>?ROan&F%
zHT3M^TYCzb?dqn2Y}4D!EM&>&4mn?ASrB?Jnh=gZ)@tiAS`vC#4Lv48@!gjg2|c#;
zUL-=lowglz@`4)!x96MCLsVTG8(3zW(41J4w#(^`Exp{oL<loYOoS3+QJ#f4A9HMn
zd9X@{W;UI~<2}!K$;@6a*gg!g=0^pVSx*=7&}^ubGk;Y1hW;hyG}+>a(d7O`lg&Y4
z2t6b1wg~;tedwageLgvGv)eQwq4%wZ&`Tr;VJ?hG-o8z7^=R8On@Iiuog$orMh^Cu
zfDt*}|I-R!VaO7pwe-E4P{x(UJhCM8u!J7dZM=7c+M(|`h-SUJ@S2_x&Ox(k>35h}
z5qto$I&<C*Jg$A4iJT;LuArgM2i_~+(7!|o&(@VA8t>OV|9(B$qkJEzt3)LKtpc=>
z#S_Nuf%Z~)5s3?b58U1slGbh_`5r{u7QL6vY;IYc<zLCfcVE|wXuP|6{{2tu_|7!X
zeOf0X`TN!|TI-yH#?(QxJesawHnZ0Xu0i|8(}CM-0ZwcpLO-z@`Ij2{mj}^&;1kcy
z^o?Px&U|x#=Vt1W<p-Yov`a)wuAk@M|J=+LWHh$CX}dR2Tm-o=nAv!eT<IZkQe?S3
ze4W>;0N<?ev1b+$dWkRLySV*6k&N?5V8sYE^!GjYX*XAXGwThyE3ld8W+rBMIUYii
zmNO5S4%}THeW~D?!0oM1Vu~(0en{I9F>`Qbj6)E5o^DXS31uHit4A=-?*?e29zq%8
zxlhZJl;6x6KMK&sN2S(V74FQ~8Lmhg<`WsTd11k|^A&-!Dtv6PnSD_b`d8sQ<fc9F
z{frmLKKOq>2Y9uP?}T{AJV#Qy4CUV!_*Q_XUdnhc<;6L!$maIY=kH^{l)&TLLDB&Q
zp1&W_M(+B>_8KLje-$Ch>-{LJEJu>s16PG;3V5N8?~TTPZSBnoSG8+N`F8~V7-&zt
zkmW`)v#G#+k?;3c%&aIyWwO6Hn9U^{hsdiXbt;-XofrRqRQT9T;Ng<cmrdxtlW}wd
zewWesF2w)aEx<^ZJ*w6Np%oY!pnt!S)H?(D{}R|bKsyV7A*J?P5ivOL70s#ZwhY?b
z5co*}??}HVc_wTN_nFzukc6J68|HN2<p50`CFzvFx4nab{|waJ|2FX5Cj<0vW#CRp
z%LSDG2>}nCA!arsg8lR&@MfgjeFkt>GaPGy+Z#e+X$y^?N!q+X+WE=A!L?qXN)7$1
z7!;_T>m=<TXmRWg+!62s_h=5}zZ-Ceqz(b(e+Wr=QOkk+i>L)J4R<cC*_24_5+~s5
z44Uo)+%Ktn0myta;15-NbObQCB=olNSfF+~01r#*?|E??2s{piTIe%?XB+tb2w+^G
zzJ42cL{c}8@;?!H0O%NS4aY?2w-IO2oo2}lmqi|s0l<U|+T9SiG0(B-&a3@CDx2B?
zE^!yAlF-|@VGbo+p@HRqdnH}r9H!D-7#$^D20T*b;z$b*Ip>&0ZuoZu?C&>$;gWVr
zS^mpO`aN(9{_CDEj#tfWWJLRE3h?L1w)rqK8%A?L8O-?{;L41~dn9m8PRYEpJFly$
z_x`q16etP3GHwsK{(*l7Mo9W*N(<va;2*&G_^+zABnIY8{*WZ7cwW)~Nvk#}`*xC!
zB?-a%K}On9Y`CH9PiDxfeD!s}XBoA9mZYEMjLbU#cal5>R)b$TC*qROtH3QJ)oVgx
zW8iT~gCreR>)WoR6(pS~>1C2<gRL@<+q*PoZeMi6|0nQV;J&v2rvUFrx>nK-HOhZI
zN#_IqbQXq<Gm!rm?ofydX7;?3OAMGvb2!6gO6bl%;nEDpeW|2N^I(3L)Rp9!?64}o
zGGbY4xIHD7wiw4tx(_%ugXZ^hf0HB)a+>xq;A7x(k~DuSy1$KpZGas~(#kHEvFLuc
z<eN?dxDwbsgE4d`N&fSFNn=U8c3%O;0+UI61iCr-ujS;wE&i+5Rb?G<@!v7x2Eyb(
zsD!&>hyZ8;4IPrOtM33?WYqr8fL@YLbG15RB=c1rnQve1SAa9kY^mYZCTRhF&9Xa~
z*(-V51(LQUOiXl9FbP=K%x0$~{}!j!ZB&Z3D$EBqG_$dh?x&SW($Qv}0AzdTCliZY
zE(Ctzv59NV?92?uw+l&W)hspTp}^5*HYTz?u_uW&uU8FU8(?P3Ox<0Y+?TDT4`Z<m
zJS8gPs<g=5$-k9?=V?wEx5Y~4ZazOJd*`@UV<Ph=(9kin7l4~Hmce$wP)RY=aX?Zh
zNtXam)kx-(N&KS7lF;*v^GLF8m1r9u;m5P|&%}}OEOyKWF3v$eZ*21Rvru?iBN*ek
z!1#>&up)4mq`yhZ%<AVHmfr*}pmxjn4=ZKh3_<9*y)>BFDB|=Qjt%Ggs95FR<9`y#
zp%gPNbM>fW-%rnxgxh3+nMCL?7=lA0nD@!RF_9=o`v9*y$JccO68RpIo+NQtUca8p
zsF_t<zop5&3bG=bBnf%Ji+GG1cP6{*OEE7Kqk-S%sJ~fh$#=Wd&dr7>F2img|7RpJ
z=}6-E`i`XA9oeSNg_62RI$qNABpKcIt@Ec|2hNE_d(JhXJFnrhOWs&2W&@|B=-Iw3
z{FLlXb}?chaMGe$$T`8SB#|1;a*-$r{Y(5e@Yjg?(;hg^k?nhuE|auZBbD1EttROh
zNw)%@kYq~SrGY-q1dgnBkC$O<)sg!Bl5Qpm!6@-1&UMcczU4nn(vc*w=^aY3|35A>
zvmrU#OOqu%K-iGb*UjwZCS4<~5zW0M9Y>O@VvES+v^I$~_IzNDq<;W!0V9Diz(kUe
z)!9H7pewKv(32z*XCpVJO;haCd=l^cs?XSx(5uH;zz&2dKbi+TLQ>m1)M4<Fq>ITm
zSw&2EfutO39&uw}Lcgww*GW|VCuTNP(!Rj+B)QjPL?>Vm_m>p}oNi_{)fOpD?$s~E
z*(Ak0J}<e1k-!N7OzmIMNC}(gJywhZ4mY!TIo(Tx3FjO)o94<47d4@~`JV(FKw^?E
zv2>hkW;KWVm0@eOEyPj4;lR8m7Q+<auq+&m+y&yh?sng-m;rpt9g2BIsOXWqBhH=|
zO4Ez+EFA+JNOt+&W5%Usc11m3Y$0*1@qI%s5~)86oD@KAF=8fgP>6T)Hsn8tB<JyK
zO(_2_fPQB7Y5~S_3oti8J2%kWP^=v@v*AErk~iuS$y}XhW_3pcv;^2xvx+8lGrODQ
z4X~M#&ddXjh`|ZV#kKAO3~wU&&jtEBb9E8+&}S^A{A0=(VP^k`Tom(j{`+ZY>bsE?
z9BF3E1CBSd|8C?*TJUc^o>fHYo7ufhMCvo0X81%z@}CTR19-Vf<bSA{{k34@x-sX!
zpVmdqC!#MzV`dY8y-32xnh{fhgR4m#Qw^c}jA30!ft|?A>^|VgqF!1YCINez*`NsJ
zKb531-4g|t|3qMq80DV=1_SSS`t8}k?KzNv?;HZTs4Qn@Q%J0C|3!0Uh8zZLXJ&s(
z<HuS^%0l|W$ebm;sAnNQNRl|<g8~k3IIxo|R1>TGrvV28zb@!z?^}>J^QFz5fSWx1
z{M~MC#EuU=|Ngift%rqXcCjP&qG#t6N&SnR)2ss5f?t#6bIowYGP4mRG3w72XjlV*
zUCivgoE!w_11C}(YsnwnX8)kz+viXCdG@<0C*$||c0Au*3iEcJJ_Bq^QYXBK_=w~Q
z?VPkjPg_V*G5XxBO#w6e6xf@jLff1i4`n(@I@eS4W?eC}+eorC4bHLrCjm#9*;#pw
zGp}Rc+?(>x4$VsjJu@3el99{@9&_@|<GPq&X8nME!21PR?hBk&zNwk{yR1kWs`N38
zCWWN+B|WSB;ZaFz7C`<c=}bv8awPj!NdqLU+=TmOBT4g9l;r_A8~+bIt*QMAvOboV
zbcv)n$}a{>+ANg7_HYMET39HlFHH<d?IfKdX>1M_+h|FL6mSk!m2{1yxsl6%h@{<{
ze7{_rk}My|;n+J#dOzhgb$>zk^W~Ce<%r0imvo3E3oWdHDGuV-lvpI!j*?E3G$F#p
zHpca>eZl8o9Z7$Rkl0_4w12rvKvH{2e`!#j<0bXX>G*d~(Ms{5q+SJHD?Qu=a7yGv
zzIT>F>LTf}6b5p2@Y_f}7GY;eCp&E{ODvT1H%UiHYS(0Qu&Sh=N_sCt`OlDav!vb1
zU9r?X@=%>}{a8|;oR9x-NwZV9)NIg1>*WadR5(8Z5+CpQZ_Ai&$^TX7qM9P<dnK7y
zCFd<AT_I^yz{U2aqzfgjRmxv2lJ;@t_%Q)wKV8xz?n2kK+yQOQjY;|sNi%DZ@3WG6
z7i9d~OBz<^I(w+dnt27e^_Fz5q!$B|`&dcWI}3}&Dx7sBT_tH!6$6?m=}Jkfm&Z|E
zvfjWs#XOLr=D0x8JCbgZbV4~d73W}MHwQOM8ZK#GgBFl?B|R+Z=aP0V`jdvIIa$NK
zmriKIiSQ*!M@nib*w|Yn9WUv*Dtwz3NP4`8J}?c)ubZTUoYFKj<)^mslJ0cM>-w>c
z-6{yCBd{H?4X{42Jc;Z5r@(mN72qv1TUaim)D~lj4D<j10GmlfK~&?4z?MKCV0EA;
z&<p6k*vFO!+5wZ@-{<bXV@S$UzU_*bl&EhGIy(9H0#*f9ar1za`=Ys+>h{8-dHBf5
zes(Fv^fY#0b6`_o4U)`fp8&6#*@sOq{xwMom~0Mo1-iJkHVJqWcqJzZbh4CTJ768R
zr#AuCb9=g*lWAACr{|L7v6$-C*({QfxsfCp4M&+-)S37G4@DC8G5krn%K!iX07*qo
IM6N<$f?-R5g8%>k

diff --git a/app/src/main/res/drawable/logo_2021.xml b/app/src/main/res/drawable/logo_2021.xml
new file mode 100644
index 000000000..285d16412
--- /dev/null
+++ b/app/src/main/res/drawable/logo_2021.xml
@@ -0,0 +1,9 @@
+<vector android:height="22dp" android:viewportHeight="196.6"
+    android:viewportWidth="743" android:width="83.14344dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M2.4,170.4c0,-13.1 0,-81.8 0,-89.7c-0.1,-9.9 5,-73 78,-79.1c0,0 25,-2.8 26.8,23.2c0,0 0.9,19.7 -18.3,22.7c-34.2,5.2 -40.1,13.1 -40.1,56.2c0,39.1 0,66.7 0,66.7s2,24.8 -23.3,24.8C2.4,195.2 2.3,178.2 2.4,170.4z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M152.7,169.7c-26.3,-31.1 -20.7,-49.2 -21,-102.4c-0.5,-34.2 -0.8,-46.3 1.7,-51.9c3.1,-6.9 9.2,-13.7 21.7,-13.7c15.7,0 22.7,11.5 22.7,17.6c0.5,1.9 0.6,2.8 0.8,47.9l0.2,50.6c0.7,9.6 1.9,16.5 14.1,25.8c11.2,7.9 28.2,7 39.9,0c12.2,-8 15.1,-21.6 15.5,-25.8c0.2,-1.9 -0.1,-21.2 0.3,-50.6c0.3,-19.1 0,-38.6 0.2,-47.9c0.4,-6.4 7.6,-17.8 24.4,-18.1c5.9,0.1 17.5,3.8 20.8,14.2c1.7,5.1 1,51.9 1,51.9c0,45.6 5.2,76 -20.3,102.4c-16,16.3 -35.5,25.8 -62.3,25.9C185.7,195.7 167.5,185.7 152.7,169.7z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M339.1,169.7c-26.3,-31.1 -20.7,-49.2 -21,-102.4c-0.5,-34.2 -0.8,-46.3 1.7,-51.9c3.1,-6.9 9.2,-13.7 21.7,-13.7c15.7,0 22.7,11.5 22.7,17.6c0.5,1.9 0.6,2.8 0.8,47.9l0.2,50.6c0.7,9.6 1.9,16.5 14.1,25.8c11.2,7.9 28.2,7 39.9,0c12.2,-8 15.1,-21.6 15.5,-25.8c0.2,-1.9 -0.1,-21.2 0.3,-50.6c0.3,-19.1 0,-38.6 0.2,-47.9c0.4,-6.4 7.6,-17.8 24.4,-18.1c5.9,0.1 17.5,3.8 20.8,14.2c1.7,5.1 1,51.9 1,51.9c0,45.6 5.2,76 -20.3,102.4c-16,16.3 -35.5,25.8 -62.3,25.9C372,195.7 353.8,185.7 339.1,169.7z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M562.5,181.4c-1.6,-3.2 -59,-149 -59.8,-151.7c-2.7,-10.1 2.2,-21.6 14.7,-26.2c16,-4.5 24.8,3 27.4,8.6c1.5,2.5 1.3,2 22.4,55.7c8.2,20.8 15.1,37.6 15.1,37.5c0,-0.1 4.9,-12.7 14.7,-37.5c12.6,-31.8 21.6,-53.8 22.7,-55.7c4.1,-7.2 11.9,-13.4 26.7,-9.1c15.8,5.8 17.9,18.9 15.5,26.7c-0.6,2.7 -57.6,147.3 -59.8,151.7C593.6,201.8 569.5,197.7 562.5,181.4L562.5,181.4z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M737.1,30.4c0,16.2 -13.1,29.2 -29.3,29.2c-16.2,0 -29.3,-13.1 -29.3,-29.3s13.1,-29.2 29.2,-29.2C724,1.2 737.1,14.3 737.1,30.4L737.1,30.4z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M684.8,178.3c-0.5,-20.7 -0.6,-58.9 0,-80.6c1,-8.7 5.2,-18.3 22.9,-18.2c19,0 21.6,10.8 22.7,18.2c0.2,2.5 0.9,43.3 0,80.6c-0.8,6.5 -6.3,17.1 -22.7,17C691.3,195.2 686.1,186.4 684.8,178.3z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/logo_white.xml b/app/src/main/res/drawable/logo_white.xml
deleted file mode 100644
index b6f038f67..000000000
--- a/app/src/main/res/drawable/logo_white.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="157.08"
-    android:viewportHeight="22"
-    android:width="157.08dp"
-    android:height="22dp">
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M187.71,44.69a2.49,2.49,0,0,1-1.52-0.72,2.17,2.17,0,0,1-0.48-1,32.34,32.34,0,0,1-0.06-4.42c0-4.68,0-4.25 0.25-4.93a2.31,2.31,0,0,1,0.9-0.92,3,3,0,0,1,1.73-0.27,2,2,0,0,1,2,2.06c0,0.27,0,1.77,0,4.31a26.94,26.94,0,0,1-0.09,4.17,2.21,2.21,0,0,1-1.17,1.47,3.21,3.21,0,0,1-1.58 0.24Zm-32.55,0A8.23,8.23,0,0,1,149.32,42a8.08,8.08,0,0,1-2.07-4.22c-0.14-0.81-0.15-1.4-0.14-6.53,0-5.51-0.05-4.9 0.28-5.64a2.23,2.23,0,0,1,1.46-1.15,3.63,3.63,0,0,1,1.45,0,2.31,2.31,0,0,1,1.65,1.69c0.05 0.2 0.06 0.68 0.08,5.43l0,5.21a3.17,3.17,0,0,0,1.47,2.46,3.75,3.75,0,0,0,5.82-2.7c0-0.2,0-2.16,0-5.24,0-5.46,0-5.17 0.23-5.67a2.33,2.33,0,0,1,1.52-1.23,4,4,0,0,1,1.43,0,2.36,2.36,0,0,1,1,0.56,2.07,2.07,0,0,1,0.67,1.23v5.41c0,6.07,0,5.75-0.26,6.84a8.32,8.32,0,0,1-2.71,4.31A8.44,8.44,0,0,1,155.16,44.69Zm-39.13,0a2.45,2.45,0,0,1-1.52-0.72,2.81,2.81,0,0,1-0.48-1c-0.09-0.4-0.07-0.58-0.07-5.56,0-4.16,0-5.4,0-5.69a8.16,8.16,0,0,1,2.26-4.81,8.29,8.29,0,0,1,5.9-2.62,3,3,0,0,1,1.33 0.15,2.39,2.39,0,0,1,1.32,1.29,2.92,2.92,0,0,1,0.17,1.17,2.11,2.11,0,0,1-1.4,2,4.53,4.53,0,0,1-1.12 0.24,4.19,4.19,0,0,0-1.64 0.47,3.61,3.61,0,0,0-1.6,1.56,4.84,4.84,0,0,0-0.28 0.79c-0.08 0.44,0,1.42-0.07,5.42,0,4.7,0,5.06-0.1,5.54a2.18,2.18,0,0,1-1.17,1.46A3.21,3.21,0,0,1,116,44.69Zm56.77-1.46c-0.17-0.34-6.23-15.73-6.32-16a2,2,0,0,1,0-1.2,2.58,2.58,0,0,1,1.87-1.68,2.89,2.89,0,0,1,1.77 0.2,2.44,2.44,0,0,1,0.82 0.81c0.16 0.27 0.14 0.21,2.37,5.88 0.87,2.19,1.58,4,1.59,4s0.87-2.17,1.9-4.8c1.32-3.36,1.93-4.86,2-5a2.14,2.14,0,0,1,1.38-1,3.32,3.32,0,0,1,1.44 0.07,2.51,2.51,0,0,1,1.07 0.68,1.94,1.94,0,0,1,0.58,1,1.9,1.9,0,0,1,0,1.12c-0.07 0.28-6.09,15.59-6.32,16.06A2.24,2.24,0,0,1,172.8,43.22Z"
-            android:fillColor="#ffffff" />
-    </group>
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M135.58,44.72a8.39,8.39,0,0,1-7.91-6.94c-0.14-0.81-0.15-1.4-0.14-6.53,0-5.51-0.05-4.9 0.29-5.65a2.22,2.22,0,0,1,1.46-1.14,3.53,3.53,0,0,1,1.45,0,2.33,2.33,0,0,1,1.65,1.69c0.06 0.2 0.06 0.69 0.08,5.43l0,5.22a3.19,3.19,0,0,0,1.47,2.46,3.86,3.86,0,0,0,4.08 0.06,3.56,3.56,0,0,0,1.37-1.5,3.64,3.64,0,0,0,0.37-1.26c0-0.2,0-2.15,0-5.24,0-5.46,0-5.17 0.23-5.67a2.32,2.32,0,0,1,1.52-1.23,3.94,3.94,0,0,1,1.43,0,2.38,2.38,0,0,1,1,0.57,2.06,2.06,0,0,1,0.67,1.23v5.4c0,6.07,0,5.76-0.26,6.84a8.42,8.42,0,0,1-8.83,6.27Z"
-            android:fillColor="#ffffff" />
-    </group>
-    <path
-        android:pathData="M77.169996 4.52a3.0799999 3.0799999 0 0 1 -3.08 3.0799999 3.0799999 3.0799999 0 0 1 -3.08 -3.0799999 3.0799999 3.0799999 0 0 1 3.08 -3.0799999 3.0799999 3.0799999 0 0 1 3.08 3.0799999z"
-        android:fillColor="#ffffff" />
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M214.1 29.37a10 10 0 1 0 1.35 7.41l-1.35 0zm-6.4 11.92a6.39 6.39 0 0 1 -6.39 -6.29 4.35 4.35 0 0 0 1.42 0.23 4.42 4.42 0 0 0 3.85 -6.59 6.6 6.6 0 0 1 1.11 -0.1 6.39 6.39 0 1 1 0 12.78z"
-            android:fillColor="#ffffff" />
-    </group>
-    <path
-        android:pathData="M100.14 0l56.94 0 0 14.03 -56.94 0z"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.2" />
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M224.29,27.86a0.57 0.57,0,0,1-0.14 0.16 0.32 0.32,0,0,1-0.19 0.05 0.47 0.47,0,0,1-0.22-0.07l-0.27-0.15a2.22,2.22,0,0,0-0.34-0.15,1.37,1.37,0,0,0-0.44-0.06,1,1,0,0,0-0.63 0.18 0.62 0.62,0,0,0-0.21 0.49 0.45 0.45,0,0,0,0.13 0.33,1.08,1.08,0,0,0,0.33 0.22,3.54,3.54,0,0,0,0.47 0.17l0.54 0.17a4.84,4.84,0,0,1,0.54 0.23,1.79,1.79,0,0,1,0.47 0.33,1.56,1.56,0,0,1,0.33 0.49,1.76,1.76,0,0,1,0.13 0.7,2.26,2.26,0,0,1-0.16 0.85,2,2,0,0,1-0.46 0.69,2.11,2.11,0,0,1-0.74 0.46,2.75,2.75,0,0,1-1,0.17,3.18,3.18,0,0,1-0.62-0.06,3.65,3.65,0,0,1-0.61-0.18,3.49,3.49,0,0,1-0.56-0.27,2.35,2.35,0,0,1-0.45-0.35l0.45-0.71a0.37 0.37,0,0,1,0.14-0.13 0.4 0.4,0,0,1,0.19,0,0.51 0.51,0,0,1,0.27 0.09l0.31 0.19a2.51,2.51,0,0,0,0.4 0.19,1.48,1.48,0,0,0,0.53 0.09,1,1,0,0,0,0.64-0.18 0.69 0.69,0,0,0,0.23-0.58 0.55 0.55,0,0,0-0.13-0.37,1,1,0,0,0-0.33-0.24,3.08,3.08,0,0,0-0.46-0.17l-0.53-0.16a3.94,3.94,0,0,1-0.53-0.22,1.7,1.7,0,0,1-0.46-0.34,1.58,1.58,0,0,1-0.33-0.52,2.08,2.08,0,0,1-0.12-0.77,1.83,1.83,0,0,1,0.15-0.72,1.86,1.86,0,0,1,0.44-0.62,2.15,2.15,0,0,1,0.71-0.44,2.61,2.61,0,0,1,1-0.16,3.59,3.59,0,0,1,0.58,0,3.11,3.11,0,0,1,0.54 0.14,3,3,0,0,1,0.48 0.22,2.2,2.2,0,0,1,0.4 0.29Z"
-            android:fillColor="#ffffff" />
-    </group>
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M231.6 26.53l0 1.2 -1.84 0 0 5.34 -1.52 0 0 -5.34 -1.84 0 0 -1.2z"
-            android:fillColor="#ffffff" />
-    </group>
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M238.95,33.07h-1.18a0.54 0.54,0,0,1-0.33-0.09 0.47 0.47,0,0,1-0.18-0.24l-0.39-1.14H234.4L234,32.74a0.52 0.52,0,0,1-0.49 0.33h-1.18l2.53-6.54h1.55Zm-4.2-2.5h1.79l-0.6-1.79-0.14-0.4q-0.08-0.23-0.16-0.5-0.07 0.27-0.15 0.51c-0.05 0.16-0.1 0.29-0.14 0.4Z"
-            android:fillColor="#ffffff" />
-    </group>
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M244.85 26.53l0 1.2 -1.85 0 0 5.34 -1.5 0 0 -5.34 -1.84 0 0 -1.2z"
-            android:fillColor="#ffffff" />
-    </group>
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M248.49 33.07l-1.49 0 0 -6.54 1.53 0z"
-            android:fillColor="#ffffff" />
-    </group>
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M257.5,29.8a3.52,3.52,0,0,1-0.24,1.32,3.12,3.12,0,0,1-1.76,1.77,3.9,3.9,0,0,1-2.78,0A3.12,3.12,0,0,1,251,31.12a3.67,3.67,0,0,1,0-2.64,3.15,3.15,0,0,1,0.69-1.06,3.19,3.19,0,0,1,1.08-0.7,3.65,3.65,0,0,1,1.39-0.26,3.61,3.61,0,0,1,1.39 0.26,3.2,3.2,0,0,1,1.07 0.71,3.15,3.15,0,0,1,0.69,1.06A3.5,3.5,0,0,1,257.5,29.8Zm-1.55,0a2.82,2.82,0,0,0-0.13-0.87,1.84,1.84,0,0,0-0.36-0.66,1.55,1.55,0,0,0-0.58-0.41,2,2,0,0,0-0.78-0.14,2,2,0,0,0-0.78 0.14,1.55,1.55,0,0,0-0.58 0.41,1.85,1.85,0,0,0-0.36 0.66,3.1,3.1,0,0,0,0,1.75,1.85,1.85,0,0,0,0.36 0.66,1.53,1.53,0,0,0,0.58 0.41,2,2,0,0,0,0.78 0.14,2,2,0,0,0,0.78-0.14,1.52,1.52,0,0,0,0.58-0.41,1.84,1.84,0,0,0,0.36-0.66A2.84,2.84,0,0,0,255.95,29.8Z"
-            android:fillColor="#ffffff" />
-    </group>
-    <group
-        android:translateX="-113.96"
-        android:translateY="-22.75">
-        <path
-            android:pathData="M260.54,26.54l0.12,0,0.1 0.07 0.11 0.12L264,30.69c0-0.13,0-0.25,0-0.37s0-0.23,0-0.33V26.53h1.34v6.54h-0.79a0.73 0.73,0,0,1-0.3-0.05 0.64 0.64,0,0,1-0.23-0.2l-3.08-3.9c0,0.11,0,0.23,0,0.33s0,0.21,0,0.31v3.51h-1.34V26.53h1Z"
-            android:fillColor="#ffffff" />
-    </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash.xml b/app/src/main/res/drawable/splash.xml
index dcd1aef82..e5576e8bb 100644
--- a/app/src/main/res/drawable/splash.xml
+++ b/app/src/main/res/drawable/splash.xml
@@ -4,11 +4,10 @@
     <item
         android:drawable="@drawable/gradient_background"/>
 
-    <item>
-        <bitmap
-            android:gravity="clip_horizontal"
-            android:dither="true"
-            android:src="@drawable/ruuvi_logo_nega" />
+    <item
+        android:gravity="center_horizontal|center_vertical"
+        android:drawable="@drawable/logo_2021"
+        android:dither="true">
     </item>
 
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index c77d52d88..75ca61a67 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -16,7 +16,7 @@
         android:layout_width="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/logo" />
+        app:srcCompat="@drawable/logo_2021" />
 
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab_layout"
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index a550ee252..eaba7dcc3 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -21,5 +21,5 @@
         android:layout_margin="16dp"
         app:layout_constraintBottom_toBottomOf="@+id/backgroundImageView"
         app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@drawable/logo" />
+        app:srcCompat="@drawable/logo_2021" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 000000000..55344e519
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index be884846f..1af49533d 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -313,4 +313,4 @@
     <string name="welcome_text_4">Lähetä sovelluksen keräämät tiedot ulkoiselle palvelimelle</string>
     <string name="welcome_text_5">Näytä lähietäisyydellä olevat anturit napauttamalla SKANNAA</string>
     <string name="yes">Kyllä</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 583ee375b..2805f3f63 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -294,4 +294,4 @@
     <string name="welcome_text_4">Exporter les données mesurées vers un autre support</string>
     <string name="welcome_text_5">Afficher les capteurs à proximité en appuyant sur BALAYAGE</string>
     <string name="yes">Oui</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 48228a883..a6e8fa5e5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -301,4 +301,4 @@
     <string name="welcome_text_4">Используйте приложение как гейтвей</string>
     <string name="welcome_text_5">Нажмите СКАНИРОВАТЬ, чтобы найти и добавить датчики в Ruuvi Station</string>
     <string name="yes">Да</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 534d3d703..20089df78 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -312,4 +312,4 @@
     <string name="welcome_text_4">Skicka den information som samlas in av applikationen till en extern server</string>
     <string name="welcome_text_5">Tryck på SCAN för att se sensorerna i närheten</string>
     <string name="yes">Ja</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1aea1fd50..15816e457 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -314,4 +314,4 @@
     <string name="welcome_text_4">Let the app act as a gateway</string>
     <string name="welcome_text_5">Press SCAN to find and add nearby sensors to your Ruuvi Station</string>
     <string name="yes">Yes</string>
-</resources>
+</resources>
\ No newline at end of file

From 181f04de78d366cb65dcd5b258ef4a3b76aa50ab Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Thu, 16 Sep 2021 21:40:06 +0300
Subject: [PATCH 26/33] ISSUE #483 Do not override existing last measurement
 when syncing from Cloud if newer data was received via Bluetooth already

---
 .../java/com/ruuvi/station/database/domain/TagRepository.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
index 80c3ace5f..72fa76909 100644
--- a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
@@ -38,7 +38,10 @@ class TagRepository(
                 tagEntry.insert()
             } else {
                 tagEntry.favorite = true
-                tagEntry.updateData(reading)
+                val previousUpdate = tagEntry.updateAt
+                if (previousUpdate == null ||  previousUpdate < reading.createdAt) {
+                    tagEntry.updateData(reading)
+                }
                 tagEntry.update()
             }
         }

From d4f19ac8c3cd65f3ee038991badf7d626cf27baf Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Thu, 16 Sep 2021 22:07:11 +0300
Subject: [PATCH 27/33] ISSUE #444 Unification: show/hide SYNC button in charts
 [CHANGED] if last measurement came from cloud - hide sync/clear buttons

---
 .../main/java/com/ruuvi/station/database/domain/TagRepository.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
index 72fa76909..4e4ffa573 100644
--- a/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
+++ b/app/src/main/java/com/ruuvi/station/database/domain/TagRepository.kt
@@ -41,6 +41,7 @@ class TagRepository(
                 val previousUpdate = tagEntry.updateAt
                 if (previousUpdate == null ||  previousUpdate < reading.createdAt) {
                     tagEntry.updateData(reading)
+                    tagEntry.connectable = false
                 }
                 tagEntry.update()
             }

From 2af56f5e38a0944c1aa50f2ee385a134679b0693 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Thu, 16 Sep 2021 22:26:51 +0300
Subject: [PATCH 28/33] ISSUE #418 Add Firebase analytics [ADDED] event for
 gatt sync

---
 app/build.gradle                                       |  4 ++--
 .../bluetooth/di/BluetoothScannerInjectionModule.kt    |  2 +-
 .../bluetooth/domain/BluetoothGattInteractor.kt        |  6 +++++-
 .../station/firebase/domain/FirebaseInteractor.kt      | 10 ++++++++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 859698fec..9e3ae57f6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15042
-        versionName "1.5.42"
+        versionCode 15043
+        versionName "1.5.43"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/app/src/main/java/com/ruuvi/station/bluetooth/di/BluetoothScannerInjectionModule.kt b/app/src/main/java/com/ruuvi/station/bluetooth/di/BluetoothScannerInjectionModule.kt
index 4f6bd71af..e027d5168 100644
--- a/app/src/main/java/com/ruuvi/station/bluetooth/di/BluetoothScannerInjectionModule.kt
+++ b/app/src/main/java/com/ruuvi/station/bluetooth/di/BluetoothScannerInjectionModule.kt
@@ -31,7 +31,7 @@ object BluetoothScannerInjectionModule {
             BluetoothLibrary.getBluetoothInteractor(instance(), instance(), instance())
         }
 
-        bind<BluetoothGattInteractor>() with singleton { BluetoothGattInteractor(instance(), instance(), instance(), instance()) }
+        bind<BluetoothGattInteractor>() with singleton { BluetoothGattInteractor(instance(), instance(), instance(), instance(), instance()) }
 
         bind<BluetoothStateReceiver>() with singleton { BluetoothStateReceiver(instance(), instance()) }
 
diff --git a/app/src/main/java/com/ruuvi/station/bluetooth/domain/BluetoothGattInteractor.kt b/app/src/main/java/com/ruuvi/station/bluetooth/domain/BluetoothGattInteractor.kt
index 5517961a0..36f225173 100644
--- a/app/src/main/java/com/ruuvi/station/bluetooth/domain/BluetoothGattInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/bluetooth/domain/BluetoothGattInteractor.kt
@@ -9,6 +9,7 @@ import com.ruuvi.station.database.domain.SensorHistoryRepository
 import com.ruuvi.station.database.domain.SensorSettingsRepository
 import com.ruuvi.station.database.domain.TagRepository
 import com.ruuvi.station.database.tables.TagSensorReading
+import com.ruuvi.station.firebase.domain.FirebaseInteractor
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import timber.log.Timber
@@ -18,7 +19,8 @@ class BluetoothGattInteractor (
     private val interactor: BluetoothInteractor,
     private val tagRepository: TagRepository,
     private val sensorSettingsRepository: SensorSettingsRepository,
-    private val sensorHistoryRepository: SensorHistoryRepository
+    private val sensorHistoryRepository: SensorHistoryRepository,
+    private val firebaseInteractor: FirebaseInteractor
 ) {
     private val syncStatus = MutableStateFlow<GattSyncStatus?> (null)
     val syncStatusFlow: StateFlow<GattSyncStatus?> = syncStatus
@@ -81,6 +83,8 @@ class BluetoothGattInteractor (
     }
 
     fun saveGattReadings(sensorId: String, data: List<LogReading>) {
+        Timber.d("saveGattReadings")
+        firebaseInteractor.logGattSync(data.size)
         val tagReadingList = mutableListOf<TagSensorReading>()
         val sensorSettings = sensorSettingsRepository.getSensorSettings(sensorId)
         data.forEach { logReading ->
diff --git a/app/src/main/java/com/ruuvi/station/firebase/domain/FirebaseInteractor.kt b/app/src/main/java/com/ruuvi/station/firebase/domain/FirebaseInteractor.kt
index fc53bfce1..30364d2df 100644
--- a/app/src/main/java/com/ruuvi/station/firebase/domain/FirebaseInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/firebase/domain/FirebaseInteractor.kt
@@ -81,4 +81,14 @@ class FirebaseInteractor(
             }
         }
     }
+
+    fun logGattSync(size: Int) {
+        CoroutineScope(Dispatchers.IO).launch {
+            val emptyHistory = size == 0
+            firebaseAnalytics.logEvent("gatt_sync") {
+                param("gatt_sync_count", size.toLong())
+                param("gatt_empty_history", emptyHistory.toString())
+            }
+        }
+    }
 }
\ No newline at end of file

From 8bd167ee544d7b1802e2ded83bbdeede9f39d03a Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Fri, 17 Sep 2021 10:02:47 +0300
Subject: [PATCH 29/33] ISSUE #497 1.5.43 cloud login invalid email FI string
 missing #497

---
 .../com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
index 0a6a0b94a..dcf4759c2 100644
--- a/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
+++ b/app/src/main/java/com/ruuvi/station/network/domain/RuuviNetworkInteractor.kt
@@ -37,6 +37,7 @@ class RuuviNetworkInteractor (
 
     fun registerUser(user: UserRegisterRequest, onResult: (UserRegisterResponse?) -> Unit) {
         networkRepository.registerUser(user) {
+            networkResponseLocalizer.localizeResponse(it)
             onResult(it)
         }
     }

From 1097892233ba62d5a2f53200e69a257e34cdcafe Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Mon, 20 Sep 2021 15:46:12 +0300
Subject: [PATCH 30/33] ISSUE #500 Sensors cannot be claimed or shared if
 phone's default font size is too big [FIXED] Claim and share screens. Also
 dashboard view fixed

---
 .../main/res/layout/activity_claim_sensor.xml |   5 +-
 .../main/res/layout/activity_share_sensor.xml | 203 ++++++++++--------
 app/src/main/res/layout/item_dashboard.xml    |  66 +++---
 app/src/main/res/layout/view_tag_detail.xml   |  20 +-
 4 files changed, 164 insertions(+), 130 deletions(-)

diff --git a/app/src/main/res/layout/activity_claim_sensor.xml b/app/src/main/res/layout/activity_claim_sensor.xml
index 9e944d80f..a689cdd6a 100644
--- a/app/src/main/res/layout/activity_claim_sensor.xml
+++ b/app/src/main/res/layout/activity_claim_sensor.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -35,6 +35,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/appBarLayout"
+        android:paddingBottom="24dp"
         android:background="@color/white">
 
       <androidx.appcompat.widget.AppCompatTextView
@@ -64,4 +65,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
   </RelativeLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+  </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_share_sensor.xml b/app/src/main/res/layout/activity_share_sensor.xml
index d9dd179c9..418fe39ec 100644
--- a/app/src/main/res/layout/activity_share_sensor.xml
+++ b/app/src/main/res/layout/activity_share_sensor.xml
@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/white"
-    android:layout_height="match_parent"
     android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:fitsSystemWindows="true"
     tools:context="com.ruuvi.station.network.ui.ShareSensorActivity">
 
-  <RelativeLayout
-      android:background="@drawable/header"
-      android:fitsSystemWindows="true"
-      android:id="@+id/toolbarContainer"
-      android:layout_height="match_parent"
-      android:layout_width="match_parent">
+  <com.google.android.material.appbar.AppBarLayout
+      android:id="@+id/appBarLayout"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@color/ap_transparent"
+      android:theme="@style/AppTheme.AppBarOverlay"
+      app:elevation="0dp"
+      app:layout_constraintTop_toTopOf="parent">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:background="@color/ap_transparent"
-        android:layout_height="wrap_content"
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:theme="@style/AppTheme.AppBarOverlay"
-        app:elevation="0dp">
+        android:layout_height="?attr/actionBarSize"
+        android:background="@drawable/header"
+        app:popupTheme="@style/AppTheme.PopupOverlay" />
+  </com.google.android.material.appbar.AppBarLayout>
 
-      <androidx.appcompat.widget.Toolbar
-          android:id="@+id/toolbar"
-          android:background="@drawable/header"
-          android:layout_height="?attr/actionBarSize"
-          android:layout_width="match_parent"
-          app:popupTheme="@style/AppTheme.PopupOverlay" />
-    </com.google.android.material.appbar.AppBarLayout>
+  <androidx.core.widget.NestedScrollView
+      android:id="@+id/scrollView"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:background="@color/white"
+      app:layout_constraintBottom_toTopOf="@+id/guideline2"
+      app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/tag_settings_item_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/appBarLayout"
         android:background="@color/white">
 
       <androidx.appcompat.widget.AppCompatTextView
@@ -62,75 +63,89 @@
           app:layout_constraintLeft_toLeftOf="parent"
           app:layout_constraintTop_toBottomOf="@+id/shareSensorTitleTextView" />
 
-      <androidx.constraintlayout.widget.ConstraintLayout
-          android:id="@+id/sharingLayout"
-          android:layout_width="match_parent"
-          android:layout_height="0dp"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintTop_toBottomOf="@+id/shareSensorDisabledTitleTextView"
-          app:layout_constraintVertical_bias="0.0"
-          tools:layout_editor_absoluteX="0dp">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/addFriendTextView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginRight="8dp"
-            android:text="@string/share_sensor_add_friend"
-            android:textStyle="bold"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.appcompat.widget.AppCompatEditText
-            android:id="@+id/friendEmailEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginRight="8dp"
-            android:hint="@string/email"
-            android:inputType="textEmailAddress"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/addFriendTextView" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/shareButton"
-            style="@style/roundButton"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="48dp"
-            android:layout_marginRight="48dp"
-            android:text="@string/share"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/friendEmailEditText" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/sharedTextView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_marginTop="32dp"
-            android:layout_marginRight="8dp"
-            android:text="@string/share_sensor_already_shared"
-            android:textStyle="bold"
-            android:visibility="invisible"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/shareButton"
-            tools:visibility="visible" />
-
-        <ListView
-            android:id="@+id/sensorRecipientsListView"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/sharedTextView"
-            tools:listitem="@layout/item_shared_to_email" />
-
-      </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-  </RelativeLayout>
+  </androidx.core.widget.NestedScrollView>
+
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:background="@color/ap_gray"
+      app:layout_constraintBottom_toTopOf="@+id/guideline2"
+
+      />
+  <androidx.constraintlayout.widget.Guideline
+      android:id="@+id/guideline2"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:orientation="horizontal"
+      app:layout_constraintGuide_percent="0.50" />
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+      android:id="@+id/sharingLayout"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/guideline2">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/addFriendTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="8dp"
+        android:text="@string/share_sensor_add_friend"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatEditText
+        android:id="@+id/friendEmailEditText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="8dp"
+        android:hint="@string/email"
+        android:inputType="textEmailAddress"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/addFriendTextView" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/shareButton"
+        style="@style/roundButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="48dp"
+        android:layout_marginRight="48dp"
+        android:text="@string/share"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/friendEmailEditText" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/sharedTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginRight="8dp"
+        android:text="@string/share_sensor_already_shared"
+        android:textStyle="bold"
+        android:visibility="invisible"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/shareButton"
+        tools:visibility="visible" />
+
+    <ListView
+        android:id="@+id/sensorRecipientsListView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/sharedTextView"
+        tools:listitem="@layout/item_shared_to_email" />
+
+  </androidx.constraintlayout.widget.ConstraintLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard.xml b/app/src/main/res/layout/item_dashboard.xml
index 7eab67c62..65e75be9c 100644
--- a/app/src/main/res/layout/item_dashboard.xml
+++ b/app/src/main/res/layout/item_dashboard.xml
@@ -19,7 +19,7 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/deviceId"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/letter_ball_radius"
         android:fontFamily="@font/montserrat_bold"
@@ -60,21 +60,15 @@
         tools:layout_height="26dp"
         tools:layout_width="26dp" />
 
-    <androidx.gridlayout.widget.GridLayout
-        android:id="@+id/row_main_grid"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:padding="8dp"
-        app:columnCount="2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/letterImage"
-        app:useDefaultMargins="true">
-
         <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:id="@+id/temperatureLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="8dp"
+            app:layout_constraintTop_toBottomOf="@+id/letterImage"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/guideline3"
             app:layout_columnWeight="1">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -99,8 +93,13 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="8dp"
+            app:layout_constraintTop_toBottomOf="@+id/letterImage"
+            app:layout_constraintStart_toEndOf="@+id/guideline3"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_columnWeight="1">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -125,8 +124,14 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:id="@+id/pressureLayout"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="8dp"
+            app:layout_constraintTop_toBottomOf="@+id/temperatureLayout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/guideline3"
             app:layout_columnWeight="1">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -152,8 +157,13 @@
 
 
         <RelativeLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="8dp"
+            app:layout_constraintTop_toBottomOf="@+id/temperatureLayout"
+            app:layout_constraintStart_toStartOf="@+id/guideline3"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_columnWeight="1">
 
             <androidx.appcompat.widget.AppCompatImageView
@@ -171,12 +181,11 @@
                 android:layout_marginStart="4dp"
                 android:layout_toEndOf="@id/row_main_movement_icon"
                 android:fontFamily="@font/montserrat"
-                tools:text="124"
                 android:textColor="@color/mainDark"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                tools:text="124" />
 
         </RelativeLayout>
-    </androidx.gridlayout.widget.GridLayout>
 
     <TextView
         android:id="@+id/lastSeenTextView"
@@ -190,6 +199,13 @@
         android:textSize="15sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/row_main_grid"
+        app:layout_constraintTop_toBottomOf="@+id/pressureLayout"
         tools:text="Updated 2 h 5 min 45 s ago" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.50"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_tag_detail.xml b/app/src/main/res/layout/view_tag_detail.xml
index 58af7618a..45c1e697b 100644
--- a/app/src/main/res/layout/view_tag_detail.xml
+++ b/app/src/main/res/layout/view_tag_detail.xml
@@ -18,10 +18,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="50dp"
-            tools:text="@string/temperature_reading"
+            tools:text="21.72"
             android:fontFamily="@font/oswald_bold"
             android:textColor="@color/white"
-            android:textSize="76sp"
+            android:textSize="72sp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -34,11 +34,11 @@
             android:gravity="center"
             android:fontFamily="@font/oswald_light"
             android:textColor="@color/white"
-            android:textSize="40sp"
+            android:textSize="36sp"
             app:layout_constraintBottom_toBottomOf="@id/tagTemperatureTextView"
             app:layout_constraintLeft_toRightOf="@id/tagTemperatureTextView"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="°U" />
+            tools:text="°С" />
 
         <LinearLayout
             android:id="@+id/tagHumidityLayout"
@@ -160,11 +160,13 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <include
+            android:id="@+id/tag_graphs"
+            layout="@layout/view_graphs"
+            android:visibility="invisible"
+            tools:layout_editor_absoluteX="0dp"
+            tools:layout_editor_absoluteY="0dp" />
 
-    <include
-        android:id="@+id/tag_graphs"
-        layout="@layout/view_graphs"
-        android:visibility="invisible" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 8d27fe6387585c993e283616603d9240965c49c6 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Mon, 20 Sep 2021 15:54:19 +0300
Subject: [PATCH 31/33] version bump

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9e3ae57f6..c55a95306 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15043
-        versionName "1.5.43"
+        versionCode 15044
+        versionName "1.5.44"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

From d87392c150e53aad8fd1237b184bea47f748e201 Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Mon, 20 Sep 2021 18:41:02 +0300
Subject: [PATCH 32/33] ISSUE #492 1.5.42 Dashboard arrow exists app first time
 after cloud sync

---
 .../main/java/com/ruuvi/station/network/ui/SignInActivity.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/ruuvi/station/network/ui/SignInActivity.kt b/app/src/main/java/com/ruuvi/station/network/ui/SignInActivity.kt
index 46e43c5ff..d5be08f0b 100644
--- a/app/src/main/java/com/ruuvi/station/network/ui/SignInActivity.kt
+++ b/app/src/main/java/com/ruuvi/station/network/ui/SignInActivity.kt
@@ -6,7 +6,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.ruuvi.station.R
 import com.ruuvi.station.network.domain.RuuviNetworkInteractor
-import com.ruuvi.station.tagdetails.ui.TagDetailsActivity
+import com.ruuvi.station.startup.ui.StartupActivity
 import org.kodein.di.Kodein
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.closestKodein
@@ -25,7 +25,7 @@ class SignInActivity: AppCompatActivity(), KodeinAware{
 
     override fun onBackPressed() {
         if (networkInteractor.signedIn) {
-            val parentIntent = Intent(this, TagDetailsActivity::class.java)
+            val parentIntent = Intent(this, StartupActivity::class.java)
             parentIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
             startActivity(parentIntent)
             finish()

From c4d3d02cbc62ede2f222f92fa8865d45b352d9da Mon Sep 17 00:00:00 2001
From: Denis Andreev <andreev.denis@gmail.com>
Date: Tue, 21 Sep 2021 08:24:12 +0300
Subject: [PATCH 33/33] Hot fix for charts version bump

---
 app/build.gradle                            |  4 ++--
 app/src/main/res/layout/view_tag_detail.xml | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c55a95306..388f36957 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "com.ruuvi.station"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 15044
-        versionName "1.5.44"
+        versionCode 15045
+        versionName "1.5.45"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/app/src/main/res/layout/view_tag_detail.xml b/app/src/main/res/layout/view_tag_detail.xml
index 45c1e697b..149ca6d62 100644
--- a/app/src/main/res/layout/view_tag_detail.xml
+++ b/app/src/main/res/layout/view_tag_detail.xml
@@ -160,13 +160,11 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"/>
 
-        <include
-            android:id="@+id/tag_graphs"
-            layout="@layout/view_graphs"
-            android:visibility="invisible"
-            tools:layout_editor_absoluteX="0dp"
-            tools:layout_editor_absoluteY="0dp" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <include
+        android:id="@+id/tag_graphs"
+        layout="@layout/view_graphs"
+        android:visibility="invisible" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file