Skip to content

Commit 3e66474

Browse files
Show permission granted info
1 parent 2cfc280 commit 3e66474

File tree

4 files changed

+32
-0
lines changed

4 files changed

+32
-0
lines changed

app/src/main/java/com/dp/logcatapp/ui/screens/DeviceLogsScreen.kt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ import java.util.Locale
168168

169169
private const val TAG = "HomeScreen"
170170
private const val SNAP_SCROLL_HIDE_DELAY_MS = 2000L
171+
private const val SHOW_PERMISSION_GRANTED_INFO_PREF_KEY = "show_permission_info_dialog"
171172

172173
@OptIn(ExperimentalMaterial3Api::class)
173174
@Composable
@@ -1215,6 +1216,31 @@ private fun MaybeShowPermissionRequiredDialog() {
12151216
Icon(Icons.Default.Info, contentDescription = null)
12161217
}
12171218
)
1219+
} else {
1220+
val showPermissionInfoDialog = rememberBooleanSharedPreference(
1221+
key = SHOW_PERMISSION_GRANTED_INFO_PREF_KEY,
1222+
default = true,
1223+
)
1224+
if (showPermissionInfoDialog.value) {
1225+
Dialog(
1226+
onDismissRequest = {
1227+
showPermissionInfoDialog.value = false
1228+
},
1229+
title = {
1230+
Text(stringResource(R.string.permission_granted_info_title))
1231+
},
1232+
content = {
1233+
Text(stringResource(R.string.permission_granted_info_body))
1234+
},
1235+
confirmButton = {
1236+
TextButton(
1237+
onClick = { showPermissionInfoDialog.value = false },
1238+
) {
1239+
Text(stringResource(android.R.string.ok))
1240+
}
1241+
}
1242+
)
1243+
}
12181244
}
12191245

12201246
if (showAskingForRootPermissionDialog) {

app/src/main/res/values-ru/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
<string name="asking_permission_for_root_access">Запрос root-доступа…</string>
116116
<string name="app_restart_dialog_title">Требуется перезапуск приложения</string>
117117
<string name="app_restart_dialog_msg_body">Нажатие «ОК» закроет приложение. Теперь вы должны увидеть полный список журналов.</string>
118+
<string name="permission_granted_info_body">Обратите внимание, если вы не видите все журналы сразу, вам нужно будет подождать, пока система снова запросит разрешение на просмотр журналов, и предоставить доступ. Это связано с более жесткими ограничениями в последних версиях Android.</string>
118119
<string name="select_export_format">Выберите формат экспорта</string>
119120
<string name="export_format_default">По умолчанию</string>
120121
<string name="export_format_single_line">Одна строка</string>
@@ -123,4 +124,5 @@
123124
<string name="version_fmt">Версия %s</string>
124125
<string name="unable_to_start_logcat_error_msg">Невозможно запустить процесс logcat и прочитать журналы</string>
125126
<string name="compact_view">Компактный вид</string>
127+
<string name="permission_granted_info_title">Разрешение READ_LOGS предоставлено</string>
126128
</resources>

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@
112112
<string name="asking_permission_for_root_access">要求获得ROOT访问权限…</string>
113113
<string name="app_restart_dialog_title">需要重启应用</string>
114114
<string name="app_restart_dialog_msg_body">点击确定将终止该应用程序。 从现在开始,您应该会看到完整的日志列表。</string>
115+
<string name="permission_granted_info_title">已授予 READ_LOGS 权限</string>
116+
<string name="permission_granted_info_body">请注意,如果您没有立即看到所有日志,则需要等待系统再次请求允许查看日志并授予访问权限。这是由于最近的 Android 版本限制更严格。</string>
115117
<string name="select_export_format">选择导出格式</string>
116118
<string name="export_format_default">默认</string>
117119
<string name="export_format_single_line">单行</string>

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@
117117
<string name="asking_permission_for_root_access">Asking permission for ROOT access…</string>
118118
<string name="app_restart_dialog_title">App restart required</string>
119119
<string name="app_restart_dialog_msg_body">Tapping OK will kill the app. You should see a complete list of logs from now on.</string>
120+
<string name="permission_granted_info_title">READ_LOGS permission granted</string>
121+
<string name="permission_granted_info_body">Please note if you do not see all the logs right away, you will need to wait for the system to ask again to allow access to view the logs, and grant access. This is due to tighter restriction in recent Android versions.</string>
120122
<string name="select_export_format">Select export format</string>
121123
<string name="export_format_default">Default</string>
122124
<string name="export_format_single_line">Single line</string>

0 commit comments

Comments
 (0)