-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement sending logs to developer (#190)
* Save logs to a file * Send logs via email * Enable network logs in release builds * Remove useless chooser title * Append to logs file and ignore I/O errors * Ensure email and password are not logged * Ensure base URL is never logged * Add logs disclaimer
- Loading branch information
Showing
29 changed files
with
499 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,56 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:tools="http://schemas.android.com/tools"> | ||
xmlns:tools="http://schemas.android.com/tools"> | ||
|
||
<uses-permission android:name="android.permission.INTERNET" /> | ||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
<uses-permission android:name="android.permission.INTERNET" /> | ||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> | ||
|
||
<application | ||
android:name="gq.kirmanak.mealient.App" | ||
android:allowBackup="false" | ||
android:dataExtractionRules="@xml/data_extraction_rules" | ||
android:fullBackupContent="@xml/full_backup_rules" | ||
android:icon="@mipmap/ic_launcher" | ||
android:label="@string/app_name" | ||
android:networkSecurityConfig="@xml/network_security_config" | ||
android:roundIcon="@mipmap/ic_launcher" | ||
android:supportsRtl="true" | ||
android:theme="@style/Theme.App.Starting" | ||
android:localeConfig="@xml/locales_config" | ||
tools:ignore="UnusedAttribute"> | ||
<activity | ||
android:name=".ui.activity.MainActivity" | ||
android:exported="true" | ||
android:windowSoftInputMode="adjustPan"> | ||
<intent-filter> | ||
<action android:name="android.intent.action.MAIN" /> | ||
<application | ||
android:name="gq.kirmanak.mealient.App" | ||
android:allowBackup="false" | ||
android:dataExtractionRules="@xml/data_extraction_rules" | ||
android:fullBackupContent="@xml/full_backup_rules" | ||
android:icon="@mipmap/ic_launcher" | ||
android:label="@string/app_name" | ||
android:localeConfig="@xml/locales_config" | ||
android:networkSecurityConfig="@xml/network_security_config" | ||
android:roundIcon="@mipmap/ic_launcher" | ||
android:supportsRtl="true" | ||
android:theme="@style/Theme.App.Starting" | ||
tools:ignore="UnusedAttribute"> | ||
<activity | ||
android:name=".ui.activity.MainActivity" | ||
android:exported="true" | ||
android:windowSoftInputMode="adjustPan"> | ||
<intent-filter> | ||
<action android:name="android.intent.action.MAIN" /> | ||
|
||
<category android:name="android.intent.category.LAUNCHER" /> | ||
</intent-filter> | ||
</activity> | ||
<activity | ||
android:name=".ui.share.ShareRecipeActivity" | ||
android:exported="true" | ||
android:theme="@style/AppTheme"> | ||
<intent-filter> | ||
<action android:name="android.intent.action.SEND" /> | ||
<category android:name="android.intent.category.DEFAULT" /> | ||
<data android:mimeType="text/plain" /> | ||
</intent-filter> | ||
<meta-data | ||
android:name="android.service.chooser.chooser_target_service" | ||
android:value="androidx.sharetarget.ChooserTargetServiceCompat" /> | ||
</activity> | ||
</application> | ||
<category android:name="android.intent.category.LAUNCHER" /> | ||
</intent-filter> | ||
</activity> | ||
<activity | ||
android:name=".ui.share.ShareRecipeActivity" | ||
android:exported="true" | ||
android:theme="@style/AppTheme"> | ||
<intent-filter> | ||
<action android:name="android.intent.action.SEND" /> | ||
<category android:name="android.intent.category.DEFAULT" /> | ||
<data android:mimeType="text/plain" /> | ||
</intent-filter> | ||
<meta-data | ||
android:name="android.service.chooser.chooser_target_service" | ||
android:value="androidx.sharetarget.ChooserTargetServiceCompat" /> | ||
</activity> | ||
|
||
<provider | ||
android:name="androidx.core.content.FileProvider" | ||
android:authorities="${applicationId}.provider" | ||
android:exported="false" | ||
android:grantUriPermissions="true"> | ||
<meta-data | ||
android:name="android.support.FILE_PROVIDER_PATHS" | ||
android:resource="@xml/file_provider_paths" /> | ||
</provider> | ||
</application> | ||
|
||
</manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
app/src/main/java/gq/kirmanak/mealient/data/auth/impl/CredentialsLogRedactor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
package gq.kirmanak.mealient.data.auth.impl | ||
|
||
import gq.kirmanak.mealient.logging.LogRedactor | ||
import kotlinx.coroutines.flow.MutableStateFlow | ||
import java.net.URLEncoder | ||
import javax.inject.Inject | ||
import javax.inject.Singleton | ||
|
||
@Singleton | ||
class CredentialsLogRedactor @Inject constructor() : LogRedactor { | ||
|
||
private data class Credentials( | ||
val login: String, | ||
val password: String, | ||
val urlEncodedLogin: String = URLEncoder.encode(login, Charsets.UTF_8.name()), | ||
val urlEncodedPassword: String = URLEncoder.encode(password, Charsets.UTF_8.name()), | ||
) | ||
|
||
private val credentialsState = MutableStateFlow<Credentials?>(null) | ||
|
||
fun set(login: String, password: String) { | ||
credentialsState.value = Credentials(login, password) | ||
} | ||
|
||
fun clear() { | ||
credentialsState.value = null | ||
} | ||
|
||
override fun redact(message: String): String { | ||
val credentials = credentialsState.value ?: return message | ||
|
||
return message | ||
.replace(credentials.login, "<login>") | ||
.replace(credentials.urlEncodedLogin, "<login>") | ||
.replace(credentials.password, "<password>") | ||
.replace(credentials.urlEncodedPassword, "<password>") | ||
} | ||
} |
49 changes: 49 additions & 0 deletions
49
app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/BaseUrlLogRedactor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
package gq.kirmanak.mealient.data.baseurl.impl | ||
|
||
import androidx.core.net.toUri | ||
import gq.kirmanak.mealient.architecture.configuration.AppDispatchers | ||
import gq.kirmanak.mealient.data.baseurl.ServerInfoStorage | ||
import gq.kirmanak.mealient.logging.LogRedactor | ||
import kotlinx.coroutines.CoroutineScope | ||
import kotlinx.coroutines.SupervisorJob | ||
import kotlinx.coroutines.flow.MutableStateFlow | ||
import kotlinx.coroutines.launch | ||
import javax.inject.Inject | ||
import javax.inject.Provider | ||
import javax.inject.Singleton | ||
|
||
@Singleton | ||
class BaseUrlLogRedactor @Inject constructor( | ||
private val serverInfoStorageProvider: Provider<ServerInfoStorage>, | ||
private val dispatchers: AppDispatchers, | ||
) : LogRedactor { | ||
|
||
private val hostState = MutableStateFlow<String?>(null) | ||
|
||
init { | ||
setInitialBaseUrl() | ||
} | ||
|
||
private fun setInitialBaseUrl() { | ||
val scope = CoroutineScope(dispatchers.default + SupervisorJob()) | ||
scope.launch { | ||
val serverInfoStorage = serverInfoStorageProvider.get() | ||
hostState.compareAndSet( | ||
expect = null, | ||
update = serverInfoStorage.getBaseURL()?.extractHost(), | ||
) | ||
} | ||
} | ||
|
||
fun set(baseUrl: String) { | ||
hostState.value = baseUrl.extractHost() | ||
} | ||
|
||
|
||
override fun redact(message: String): String { | ||
val host = hostState.value ?: return message | ||
return message.replace(host, "<host>") | ||
} | ||
} | ||
|
||
private fun String.extractHost() = runCatching { toUri() }.getOrNull()?.host |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.