Skip to content
This repository was archived by the owner on Jun 8, 2024. It is now read-only.

Commit a649b96

Browse files
committed
UI: Let poor Huawei and Xiaomi users unite against their mobile phone manufacturers
Signed-off-by: Fung Gwo <fython@163.com>
1 parent d12ccd4 commit a649b96

6 files changed

Lines changed: 34 additions & 2 deletions

File tree

mobile/src/main/kotlin/info/papdt/express/helper/ui/DetailsActivity.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,10 @@ class DetailsActivity : AbsActivity() {
228228

229229
override fun doInBackground(vararg voids: Void): Items {
230230
if (!this@DetailsActivity::data.isInitialized) {
231-
data = intent.getParcelableExtra(EXTRA_DATA)
231+
data = intent.getParcelableExtra(EXTRA_DATA) ?: run {
232+
finish()
233+
return Items()
234+
}
232235
}
233236

234237
return buildItems()

mobile/src/main/kotlin/info/papdt/express/helper/ui/ScannerActivity.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,19 @@ class ScannerActivity : AbsActivity(), ZXingScannerView.ResultHandler, Permissio
9999
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
100100
intent.addCategory(Intent.CATEGORY_OPENABLE)
101101
intent.type = "image/*"
102-
startActivityForResult(intent, REQUEST_CODE_GALLERY)
102+
try {
103+
startActivityForResult(intent, REQUEST_CODE_GALLERY)
104+
} catch (e: Exception) {
105+
buildAlertDialog {
106+
titleRes = R.string.dialog_no_documents_app_title
107+
messageRes = R.string.dialog_no_documents_app_summary
108+
okButton()
109+
neutralButton(R.string.dialog_no_documents_app_why_i_will_meet_this) { _, _ ->
110+
startActivity(Intent(Intent.ACTION_VIEW)
111+
.setData(Uri.parse(getString(R.string.broken_api_post_url))))
112+
}
113+
}.show()
114+
}
103115
true
104116
}
105117
else -> super.onOptionsItemSelected(item)

mobile/src/main/res/values-yue/strings.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,4 +353,8 @@
353353

354354
<string name="action_reset_search">重置搜尋</string>
355355

356+
<string name="dialog_no_documents_app_title">冇「檔案」應用程式</string>
357+
<string name="dialog_no_documents_app_summary">唔好意思,你嘅裝置軟體經過唔正當修改,無得從媒體庫入面揀相,請聯絡你嘅裝置製造商搵下解決方案或者換個作業系統。</string>
358+
<string name="dialog_no_documents_app_why_i_will_meet_this">點解會遇到佢</string>
359+
356360
</resources>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,4 +353,8 @@
353353

354354
<string name="action_reset_search">重置搜索</string>
355355

356+
<string name="dialog_no_documents_app_title">没有 “文档” 应用</string>
357+
<string name="dialog_no_documents_app_summary">抱歉,您的手机系统经过不正当的修改,无法从图库中选择图片,请联系您的手机制造商寻找解决方案或更换操作系统。</string>
358+
<string name="dialog_no_documents_app_why_i_will_meet_this">为什么会遇到这个</string>
359+
356360
</resources>

mobile/src/main/res/values-zh-rTW/strings.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,5 +352,9 @@
352352
<string name="no_category_text">這裡沒有分類,嘗試添加一些來分類你的包裹。</string>
353353

354354
<string name="action_reset_search">重置搜尋</string>
355+
356+
<string name="dialog_no_documents_app_title">沒有「檔案」應用程式</string>
357+
<string name="dialog_no_documents_app_summary">抱歉,您的裝置軟體經過不正當的修改,無法從媒體庫中選取相片,請聯絡您的裝置製造商尋求解決方案或更換作業系統。</string>
358+
<string name="dialog_no_documents_app_why_i_will_meet_this">為什麼會遇到這個</string>
355359

356360
</resources>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,4 +385,9 @@
385385

386386
<string name="action_reset_search">Reset search</string>
387387

388+
<string name="dialog_no_documents_app_title">No Documents app</string>
389+
<string name="dialog_no_documents_app_summary">Sorry, your phone cannot choose images from gallery due to improper modification. Please contact your phone manufacturer or change another OS.</string>
390+
<string name="dialog_no_documents_app_why_i_will_meet_this">Why I will meet this</string>
391+
<string name="broken_api_post_url" translatable="false">https://feng.moe/archives/46/</string>
392+
388393
</resources>

0 commit comments

Comments
 (0)