forked from upstream-mirrors/quik
Fix crash when Samsung device tries to set default SMS app
This commit is contained in:
@@ -8,6 +8,7 @@ import android.content.Intent
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.provider.Settings
|
||||
import android.provider.Telephony
|
||||
import com.moez.QKSMS.common.util.NotificationManager
|
||||
import com.moez.QKSMS.presentation.compose.ComposeActivity
|
||||
import com.moez.QKSMS.presentation.compose.ComposeViewModel
|
||||
@@ -33,6 +34,14 @@ class Navigator @Inject constructor(val context: Context) {
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showDefaultSmsDialog() {
|
||||
val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
|
||||
if (Telephony.Sms.getDefaultSmsPackage(context) != context.packageName) {
|
||||
intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, context.packageName)
|
||||
}
|
||||
startActivity(intent)
|
||||
}
|
||||
|
||||
fun showCompose(body: String? = null) {
|
||||
val intent = Intent(context, ComposeActivity::class.java)
|
||||
intent.putExtra("body", body)
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
package com.moez.QKSMS.presentation.settings
|
||||
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.provider.Telephony
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.di.appComponent
|
||||
import com.moez.QKSMS.common.util.Preferences
|
||||
@@ -78,13 +76,7 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
Timber.v("Preference click: ${context.resources.getResourceName(it.id)}")
|
||||
|
||||
when (it.id) {
|
||||
R.id.defaultSms -> {
|
||||
val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
|
||||
if (Telephony.Sms.getDefaultSmsPackage(context) != context.packageName) {
|
||||
intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, context.packageName)
|
||||
}
|
||||
context.startActivity(intent)
|
||||
}
|
||||
R.id.defaultSms -> navigator.showDefaultSmsDialog()
|
||||
|
||||
R.id.theme -> newState { it.copy(selectingTheme = true) }
|
||||
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
package com.moez.QKSMS.presentation.setup
|
||||
|
||||
import android.Manifest
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.provider.Telephony
|
||||
import android.support.v4.app.ActivityCompat
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.di.appComponent
|
||||
import com.moez.QKSMS.presentation.Navigator
|
||||
import com.moez.QKSMS.presentation.common.base.QkActivity
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.setup_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class SetupActivity : QkActivity<SetupViewModel>(), SetupView {
|
||||
|
||||
@@ -21,6 +21,8 @@ class SetupActivity : QkActivity<SetupViewModel>(), SetupView {
|
||||
override val skipIntent by lazy { skip.clicks() }
|
||||
override val nextIntent by lazy { next.clicks() }
|
||||
|
||||
@Inject lateinit var navigator: Navigator
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
}
|
||||
@@ -43,9 +45,7 @@ class SetupActivity : QkActivity<SetupViewModel>(), SetupView {
|
||||
}
|
||||
|
||||
override fun requestDefaultSms() {
|
||||
val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
|
||||
intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, packageName)
|
||||
startActivity(intent)
|
||||
navigator.showDefaultSmsDialog()
|
||||
}
|
||||
|
||||
override fun requestPermissions() {
|
||||
|
||||
Reference in New Issue
Block a user