Commit 50550a06 by Kim Jinsung

Android13以上端末で、写真と動画権限がない時のメッセージ変更

parent 439fa0ef
...@@ -1481,5 +1481,6 @@ ...@@ -1481,5 +1481,6 @@
<string name="msg_push_message_detail_api_error">サーバ通信が失敗したため既読情報はサーバへ送信されませんでした。</string> <string name="msg_push_message_detail_api_error">サーバ通信が失敗したため既読情報はサーバへ送信されませんでした。</string>
<string name="title_other">その他</string> <string name="title_other">その他</string>
<string name="msg_push_message_content_not_downloaded">作業が同期されていないので作業報告画面へ遷移できません。</string> <string name="msg_push_message_content_not_downloaded">作業が同期されていないので作業報告画面へ遷移できません。</string>
<string name="msg_permission_dialog_image_video">ローカル写真(フォト)を利用する為、写真と動画の権限が必要です。\nアプリ設定画面へ遷移します。</string>
</resources> </resources>
...@@ -1493,4 +1493,5 @@ ...@@ -1493,4 +1493,5 @@
<string name="msg_push_message_detail_api_error">Read info wasn\'t sent due to server error.</string> <string name="msg_push_message_detail_api_error">Read info wasn\'t sent due to server error.</string>
<string name="title_other">Other</string> <string name="title_other">Other</string>
<string name="msg_push_message_content_not_downloaded">Unable to move to the task screen due to sync error.</string> <string name="msg_push_message_content_not_downloaded">Unable to move to the task screen due to sync error.</string>
<string name="msg_permission_dialog_image_video">In order to use local photos, you need permission for photos and videos. \ nTo transition to the application setting screen.</string>
</resources> </resources>
\ No newline at end of file
...@@ -171,9 +171,15 @@ public class ABookPermissionHelper { ...@@ -171,9 +171,15 @@ public class ABookPermissionHelper {
if (mContext instanceof HTMLWebViewActivity || if (mContext instanceof HTMLWebViewActivity ||
mContext instanceof OperationListActivity) { mContext instanceof OperationListActivity) {
// リソースパターンの適用 // リソースパターンの適用
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { //Android13以上
permitionTextResourceId = PatternStringUtil.patternToInt(mContext,
R.string.msg_permission_dialog_image_video,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
} else {
permitionTextResourceId = PatternStringUtil.patternToInt(mContext, permitionTextResourceId = PatternStringUtil.patternToInt(mContext,
R.string.msg_permission_dialog_storage_album, R.string.msg_permission_dialog_storage_album,
getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0)); getUserPref(mContext, AppDefType.UserPrefKey.RESOURCE_PATTERN_TYPE, 0));
}
} else { } else {
// リソースパターンの適用 // リソースパターンの適用
permitionTextResourceId = PatternStringUtil.patternToInt(mContext, permitionTextResourceId = PatternStringUtil.patternToInt(mContext,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment