From 4236414aa2761b7f741acb70f3e5a674b2a374fe Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 27 Dec 2018 20:26:07 +0100 Subject: [PATCH] updating Commons + some crashfix --- app/build.gradle | 4 ++-- .../contacts/pro/activities/MainActivity.kt | 3 ++- .../contacts/pro/activities/SimpleActivity.kt | 10 ++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 13b4566e..0c17f012 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,9 +51,9 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.5.16' + implementation 'com.simplemobiletools:commons:5.6.1' implementation 'joda-time:joda-time:2.10.1' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.4' kapt "androidx.room:room-compiler:2.0.0" diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt index ec08ce56..c68f8258 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt @@ -495,7 +495,8 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { val faqItems = arrayListOf( FAQItem(R.string.faq_1_title, R.string.faq_1_text), - FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons) + FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), + FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons) ) startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt index 63ac285a..0ff042c7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SimpleActivity.kt @@ -6,6 +6,7 @@ import android.content.Intent import android.os.Build import android.telecom.TelecomManager import com.simplemobiletools.commons.activities.BaseSimpleActivity +import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.helpers.KEY_PHONE import com.simplemobiletools.contacts.pro.helpers.REQUEST_CODE_SET_DEFAULT_DIALER @@ -54,7 +55,12 @@ open class SimpleActivity : BaseSimpleActivity() { @TargetApi(Build.VERSION_CODES.M) protected fun launchSetDefaultDialerIntent() { - val intent = Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER).putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME, packageName) - startActivityForResult(intent, REQUEST_CODE_SET_DEFAULT_DIALER) + Intent(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER).putExtra(TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME, packageName).apply { + if (resolveActivity(packageManager) != null) { + startActivityForResult(this, REQUEST_CODE_SET_DEFAULT_DIALER) + } else { + toast(R.string.no_app_found) + } + } } }