Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.ruuvi.station.dfu.domain

import com.ruuvi.station.dfu.data.LatestReleaseResponse
import com.ruuvi.station.network.domain.createHttpLoggingInterceptor
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.withContext
import okhttp3.OkHttpClient
Expand All @@ -13,9 +14,7 @@ class GitHubRepository(
private val dispatcher: CoroutineDispatcher
) {

private val interceptor: HttpLoggingInterceptor = HttpLoggingInterceptor().also {
it.level = HttpLoggingInterceptor.Level.BODY
}
private val interceptor: HttpLoggingInterceptor = createHttpLoggingInterceptor()

private val client = OkHttpClient.Builder().addInterceptor(interceptor).build()

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package com.ruuvi.station.network.data.response

import com.google.gson.annotations.SerializedName

data class RuuviNetworkResponse<T> (
val result: String,
var error: String,
val data: T?,
val code: String?
val code: String?,
@SerializedName("sub_code") val subCode: String? = null
) {
fun isSuccess() = result == successResult

Expand Down
22 changes: 22 additions & 0 deletions app/src/main/java/com/ruuvi/station/network/domain/HttpLogging.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.ruuvi.station.network.domain

import com.ruuvi.station.BuildConfig
import okhttp3.logging.HttpLoggingInterceptor

private val accessTokenInBody = Regex("\"accessToken\"\\s*:\\s*\"[^\"]*\"")

/**
* HTTP logging for debug builds only: release builds log nothing. Debug logs hide the session
* token (Authorization header and accessToken in a body) and the sign-in code and e-mail sent in
* the URL. Other body content is logged as it is.
*/
fun createHttpLoggingInterceptor(
debug: Boolean = BuildConfig.DEBUG,
logger: HttpLoggingInterceptor.Logger = HttpLoggingInterceptor.Logger.DEFAULT
): HttpLoggingInterceptor = HttpLoggingInterceptor { message ->
logger.log(message.replace(accessTokenInBody, "\"accessToken\":\"██\""))
}.also {
it.level = if (debug) HttpLoggingInterceptor.Level.BODY else HttpLoggingInterceptor.Level.NONE
it.redactHeader("Authorization")
it.redactQueryParams("token", "email")
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class NetworkResponseLocalizer (
) {
fun localizeResponse(response: RuuviNetworkResponse<*>?) {
if (response?.isError() == true) {
response.error = when (response.code) {
response.error = localizeSubCode(response.subCode) ?: 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)
Expand All @@ -36,6 +36,14 @@ class NetworkResponseLocalizer (
}
}

private fun localizeSubCode(subCode: String?): String? = when (subCode) {
ER_SUB_INVALID_CODE -> context.getString(R.string.cloud_er_sub_invalid_code)
ER_SUB_CODE_USED -> context.getString(R.string.cloud_er_sub_code_used)
ER_SUB_CODE_EXPIRED -> context.getString(R.string.cloud_er_sub_code_expired)
ER_SUB_TOO_MANY_ATTEMPTS -> context.getString(R.string.cloud_er_sub_too_many_attempts)
else -> null
}

companion object {
const val ER_FORBIDDEN = "ER_FORBIDDEN"
const val ER_UNAUTHORIZED = "ER_UNAUTHORIZED"
Expand All @@ -58,5 +66,9 @@ class NetworkResponseLocalizer (
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"
const val ER_SUB_INVALID_CODE = "ER_SUB_INVALID_CODE"
const val ER_SUB_CODE_USED = "ER_SUB_CODE_USED"
const val ER_SUB_CODE_EXPIRED = "ER_SUB_CODE_EXPIRED"
const val ER_SUB_TOO_MANY_ATTEMPTS = "ER_SUB_TOO_MANY_ATTEMPTS"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.ruuvi.station.network.domain

import com.ruuvi.station.R
import com.ruuvi.station.app.preferences.PreferencesRepository
import com.ruuvi.station.app.ui.UiText
import com.ruuvi.station.database.domain.NetworkRequestRepository
import com.ruuvi.station.database.domain.SensorSettingsRepository
import com.ruuvi.station.database.domain.TagRepository
Expand All @@ -20,20 +22,17 @@ class NetworkSignInInteractor (
private val pushRegisterInteractor: PushRegisterInteractor,
private val preferencesRepository: PreferencesRepository,
) {
fun signIn(token: String, response: (String) -> Unit) {
networkInteractor.verifyUser(token) {response->
if (response?.isSuccess() == true) {
fun signIn(token: String, email: String, onResult: (UiText?) -> Unit) {
networkInteractor.verifyUser(token, email) { response ->
val error = response?.error
if (response?.isSuccess() == true && response.data != null) {
pushRegisterInteractor.checkAndRegisterDeviceToken()
onResult(null)
} else if (error.isNullOrEmpty()) {
onResult(UiText.StringResource(R.string.unknown_error))
} else {
onResult(UiText.DynamicString(error))
}

var errorText = ""
// TODO LOCALIZE
if (response == null) {
errorText = "Unknown error"
} else if (!response.error.isNullOrEmpty()) {
errorText = response.error
}
response(errorText)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ interface RuuviNetworkApi{

@Headers("Content-Type: application/json")
@GET("verify")
suspend fun verifyUser(@Query("token") token: String): Response<UserVerifyResponse>
suspend fun verifyUser(
@Query("token") token: String,
@Query("email") email: String
): Response<UserVerifyResponse>

@Headers("Content-Type: application/json")
@GET("user")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ class RuuviNetworkInteractor (
}
}

fun verifyUser(token: String, onResult: (UserVerifyResponse?) -> Unit) {
networkRepository.verifyUser(token) { response ->
fun verifyUser(token: String, email: String, onResult: (UserVerifyResponse?) -> Unit) {
networkRepository.verifyUser(token, email) { response ->
networkResponseLocalizer.localizeResponse(response)
response?.let {
if (response.error.isNullOrEmpty() && response.data != null) {
if (response.isSuccess() && response.data != null) {
tokenRepository.saveTokenInfo(
NetworkTokenInfo(response.data.email, response.data.accessToken))
firebaseInteractor.logSignIn()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,15 @@ class RuuviNetworkRepository
@VisibleForTesting internal constructor(
private val dispatcher: CoroutineDispatcher,
private val imageInteractor: ImageInteractor,
private val preferencesRepository: PreferencesRepository
private val preferencesRepository: PreferencesRepository,
httpClient: OkHttpClient? = null
)
{
val ioScope = CoroutineScope(Dispatchers.IO)

private val interceptor: HttpLoggingInterceptor = HttpLoggingInterceptor().also {
it.level = HttpLoggingInterceptor.Level.BODY
}
private val interceptor: HttpLoggingInterceptor = createHttpLoggingInterceptor()

private val client = OkHttpClient
private val client = httpClient ?: OkHttpClient
.Builder()
.addNetworkInterceptor { chain ->
chain.proceed(
Expand Down Expand Up @@ -91,11 +90,11 @@ class RuuviNetworkRepository
}
}

fun verifyUser(token: String, onResult: (UserVerifyResponse?) -> Unit) {
fun verifyUser(token: String, email: String, onResult: (UserVerifyResponse?) -> Unit) {
ioScope.launch {
var result: UserVerifyResponse?
try {
val response = retrofitService.verifyUser(token)
val response = retrofitService.verifyUser(token, email)
if (response.isSuccessful) {
result = response.body()
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class CodeEditView @JvmOverloads
binding.code2EditText.text.toString() +
binding.code3EditText.text.toString() +
binding.code4EditText.text.toString()
Timber.d("processChanges $code")
Timber.d("processChanges ${code.length}")
if (code.length == 4) {
onCodeEntered?.invoke(code)
}
Expand All @@ -84,12 +84,12 @@ class CodeEditView @JvmOverloads
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}

override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
Timber.d("onTextChanged $s $start $before $count")
Timber.d("onTextChanged $start $before $count")
if (count > 0 && nextControl != null) nextControl.requestFocus()
}

override fun afterTextChanged(s: Editable) {
Timber.d("afterTextChanged $s")
Timber.d("afterTextChanged ${s.length}")

val input = s.toString().trim().uppercase(Locale.getDefault())
when {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,15 +409,15 @@ fun SharingWebView(
) {
super.onPageStarted(view, url, favicon)
evaluateJavascript(script) {
Timber.d("evaluateJavascript $script RESULT $it")
Timber.d("evaluateJavascript RESULT $it")
}

}

override fun onPageFinished(view: WebView?, url: String?) {
super.onPageFinished(view, url)
evaluateJavascript(script) {
Timber.d("evaluateJavascript $script RESULT $it")
Timber.d("evaluateJavascript RESULT $it")
}
}
})
Expand Down
16 changes: 12 additions & 4 deletions app/src/main/java/com/ruuvi/station/network/ui/SignInViewModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class SignInViewModel(
}
setProgress(true)

_email.value = email
_email.value = email.trim()

networkInteractor.registerUser(UserRegisterRequest(email = email.trim())) {
if (it == null) {
Expand All @@ -62,10 +62,18 @@ class SignInViewModel(
}

fun verifyCode(token: String) {
val email = _email.value
if (email.isBlank()) {
// the address does not survive process death, go back to the e-mail page to ask for it again
viewModelScope.launch {
_uiEvent.emit(UiEvent.NavigateUp)
}
return
}
setProgress(true)

networkSignInInteractor.signIn(token) { response ->
if (response.isNullOrEmpty()) {
networkSignInInteractor.signIn(token, email) { error ->
if (error == null) {
viewModelScope.launch {
var retry = true
networkDataSyncInteractor.syncNetworkData()
Expand Down Expand Up @@ -97,7 +105,7 @@ class SignInViewModel(
}
}
} else {
showError(UiText.DynamicString(response))
showError(error)
setProgress(false)
viewModelScope.launch {
_tokenProcessed.emit(true)
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@ Insgesamt verwendete Freigaben für Ihr Konto: %3$,d/%4$,d</string>
<string name="cloud_er_invalid_mac_address">Ungültige MAC-Adresse</string>
<string name="cloud_er_sub_data_storage_error">Datenspeicherfehler</string>
<string name="cloud_er_sub_no_user">Kein Benutzer</string>
<string name="cloud_er_sub_invalid_code">Dieser Code ist falsch. Bitte überprüfen Sie den Code in Ihrer E-Mail und versuchen Sie es erneut.</string>
<string name="cloud_er_sub_code_used">Dieser Code wurde bereits verwendet. Fordern Sie einen neuen Code an, um sich anzumelden.</string>
<string name="cloud_er_sub_code_expired">Dieser Code ist abgelaufen. Fordern Sie einen neuen Code an, um sich anzumelden.</string>
<string name="cloud_er_sub_too_many_attempts">Zu viele falsche Codes. Bitte warten Sie 15 Minuten und versuchen Sie es erneut.</string>
<string name="settings_experimental">Experimentelle Funktionen</string>
<string name="settings_developer">Entwicklereinstellungen</string>
<string name="calibration_description">Bei normalem Gebrauch ist es nicht erforderlich, den Offset anzupassen.\n\nWenn Sie ein fortgeschrittener Benutzer sind und die werkseitig kalibrierten Sensoren manuell konfigurieren möchten, ist dies möglich.\n\nTipps zur Kalibrierung sind auf ruuvi.com/support verfügbar</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@ Tilillesi käytetyt jaot yhteensä: %3$,d/%4$,d</string>
<string name="cloud_er_invalid_mac_address">Virheellinen MAC-osoite</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_sub_invalid_code">Koodi on väärä. Tarkista sähköpostiisi saamasi koodi ja yritä uudelleen.</string>
<string name="cloud_er_sub_code_used">Tämä koodi on jo käytetty. Pyydä uusi koodi kirjautuaksesi sisään.</string>
<string name="cloud_er_sub_code_expired">Tämä koodi on vanhentunut. Pyydä uusi koodi kirjautuaksesi sisään.</string>
<string name="cloud_er_sub_too_many_attempts">Liian monta väärää koodia. Odota 15 minuuttia ja yritä uudelleen.</string>
<string name="settings_experimental">Kokeelliset ominaisuudet</string>
<string name="settings_developer">Kehittäjäasetukset</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>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@ Total des partages utilisés pour votre compte : %3$,d/%4$,d</string>
<string name="cloud_er_invalid_mac_address">Adresse MAC invalide</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_sub_invalid_code">Ce code est incorrect. Vérifiez le code reçu par e-mail et réessayez.</string>
<string name="cloud_er_sub_code_used">Ce code a déjà été utilisé. Demandez un nouveau code pour vous connecter.</string>
<string name="cloud_er_sub_code_expired">Ce code a expiré. Demandez un nouveau code pour vous connecter.</string>
<string name="cloud_er_sub_too_many_attempts">Trop de codes incorrects. Veuillez patienter 15 minutes et réessayer.</string>
<string name="settings_experimental">Options avancées</string>
<string name="settings_developer">Paramètres du développeur</string>
<string name="calibration_description">En utilisation normale, il n\'est pas nécessaire de calibrer le capteur.\n\nSi vous souhaitez tout de même calibrer calibrer le capteur \n\n les instructions sont trouvables ici ruuvi.com/support</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@
<string name="cloud_er_invalid_mac_address">Nieprawidłowy adres MAC</string>
<string name="cloud_er_sub_data_storage_error">Błąd w zapisie danych</string>
<string name="cloud_er_sub_no_user">Brak użytkownika</string>
<string name="cloud_er_sub_invalid_code">Ten kod jest nieprawidłowy. Sprawdź kod w wiadomości e-mail i spróbuj ponownie.</string>
<string name="cloud_er_sub_code_used">Ten kod został już użyty. Poproś o nowy kod, aby się zalogować.</string>
<string name="cloud_er_sub_code_expired">Ten kod wygasł. Poproś o nowy kod, aby się zalogować.</string>
<string name="cloud_er_sub_too_many_attempts">Zbyt wiele nieprawidłowych kodów. Odczekaj 15 minut i spróbuj ponownie.</string>
<string name="settings_experimental">Funkcje eksperymentalne</string>
<string name="settings_developer">Ustawienia programisty</string>
<string name="calibration_description">W codziennym użytkowaniu nie jest konieczna regulacja wyrównania.\n\nJeśli jesteś zaawansowanym użytkownikiem i chciałbyś ręcznie skonfigurować fabrycznie skalibrowane czujniki, jest to możliwe.\n\nWskazówki dotyczące kalibracji są dostępne na stronie ruuvi.com/support.</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@ Totalt antal använda delningar för ditt konto: %3$,d/%4$,d</string>
<string name="cloud_er_invalid_mac_address">Ogiltig MAC-address</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_sub_invalid_code">Koden är felaktig. Kontrollera koden i ditt e-postmeddelande och försök igen.</string>
<string name="cloud_er_sub_code_used">Den här koden har redan använts. Begär en ny kod för att logga in.</string>
<string name="cloud_er_sub_code_expired">Den här koden har gått ut. Begär en ny kod för att logga in.</string>
<string name="cloud_er_sub_too_many_attempts">För många felaktiga koder. Vänta 15 minuter och försök igen.</string>
<string name="settings_experimental">Experimentella funktioner</string>
<string name="settings_developer">Utvecklarinställningar</string>
<string name="calibration_description">Vid normal användning är det inte nödvändigt att kalibrera sensorerna.\n\nOm du är en avancerad användare och vill kalibrera manuellt är det möjligt att göra det.\n\nKalibreringstips finns på ruuvi.com/support</string>
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@ Total used shares for your account: %3$,d/%4$,d</string>
<string name="cloud_er_invalid_mac_address">Invalid MAC address</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_sub_invalid_code">That code is incorrect. Check the code in your email and try again.</string>
<string name="cloud_er_sub_code_used">This code has already been used. Request a new code to sign in.</string>
<string name="cloud_er_sub_code_expired">This code has expired. Request a new code to sign in.</string>
<string name="cloud_er_sub_too_many_attempts">Too many incorrect codes. Please wait 15 minutes and try again.</string>
<string name="settings_experimental">Experimental features</string>
<string name="settings_developer">Developer settings</string>
<string name="calibration_description">In normal use, it\'s not necessary to adjust the offset.\n\nIf you\'re an advanced user and you\'d like to manually configure the factory calibrated sensors, it\'s possible to do so.\n\nCalibration tips are available on ruuvi.com/support</string>
Expand Down
Loading
Loading