Commit 2eeaf3d0 by zhangchengbo

fix:解决点击菜单栏-关于我们崩溃

parent 241cea43
......@@ -180,7 +180,7 @@ class MainActivity : SimpleActivity() {
R.id.show_recycle_bin -> launchRecycleBin()
R.id.show_archived -> launchArchivedConversations()
R.id.settings -> launchSettings()
R.id.about -> launchAbout()
/*R.id.about -> launchAbout()*/
else -> return@setOnMenuItemClickListener false
}
return@setOnMenuItemClickListener true
......@@ -579,22 +579,6 @@ class MainActivity : SimpleActivity() {
startActivity(Intent(applicationContext, SettingsActivity::class.java))
}
private fun launchAbout() {
val licenses = LICENSE_EVENT_BUS or LICENSE_SMS_MMS or LICENSE_INDICATOR_FAST_SCROLL
val faqItems = arrayListOf(
FAQItem(R.string.faq_2_title, R.string.faq_2_text),
FAQItem(R.string.faq_3_title, R.string.faq_3_text),
FAQItem(com.simplemobiletools.commons.R.string.faq_9_title_commons, com.simplemobiletools.commons.R.string.faq_9_text_commons)
)
if (!resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)) {
faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_2_title_commons, com.simplemobiletools.commons.R.string.faq_2_text_commons))
faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_6_title_commons, com.simplemobiletools.commons.R.string.faq_6_text_commons))
}
startAboutActivity(R.string.app_name, licenses, com.secspace.sms.BuildConfig.VERSION_NAME, faqItems, true)
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun refreshMessages(event: Events.RefreshMessages) {
......
......@@ -22,6 +22,7 @@
android:id="@+id/about"
android:icon="@drawable/ic_info_vector"
android:title="@string/about"
android:visible="false"
app:showAsAction="always" />
<item
android:id="@+id/more_apps_from_us"
......
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