Ask to be Default SMS app before asking for SMS permission

This commit is contained in:
moezbhatti
2018-11-24 17:13:00 -05:00
parent 1e3d6bc9ad
commit a1dfba2e4b
2 changed files with 21 additions and 26 deletions
@@ -283,18 +283,18 @@ class MainActivity : QkThemedActivity(), MainView {
} }
when { when {
!state.smsPermission -> {
snackbarTitle?.setText(R.string.main_permission_required)
snackbarMessage?.setText(R.string.main_permission_sms)
snackbarButton?.setText(R.string.main_permission_allow)
}
!state.defaultSms -> { !state.defaultSms -> {
snackbarTitle?.setText(R.string.main_default_sms_title) snackbarTitle?.setText(R.string.main_default_sms_title)
snackbarMessage?.setText(R.string.main_default_sms_message) snackbarMessage?.setText(R.string.main_default_sms_message)
snackbarButton?.setText(R.string.main_default_sms_change) snackbarButton?.setText(R.string.main_default_sms_change)
} }
!state.smsPermission -> {
snackbarTitle?.setText(R.string.main_permission_required)
snackbarMessage?.setText(R.string.main_permission_sms)
snackbarButton?.setText(R.string.main_permission_allow)
}
!state.contactPermission -> { !state.contactPermission -> {
snackbarTitle?.setText(R.string.main_permission_required) snackbarTitle?.setText(R.string.main_permission_required)
snackbarMessage?.setText(R.string.main_permission_contacts) snackbarMessage?.setText(R.string.main_permission_contacts)
@@ -319,9 +319,9 @@ class MainActivity : QkThemedActivity(), MainView {
override fun requestPermissions() { override fun requestPermissions() {
ActivityCompat.requestPermissions(this, arrayOf( ActivityCompat.requestPermissions(this, arrayOf(
Manifest.permission.READ_CONTACTS,
Manifest.permission.READ_SMS, Manifest.permission.READ_SMS,
Manifest.permission.SEND_SMS), 0) Manifest.permission.SEND_SMS,
Manifest.permission.READ_CONTACTS), 0)
} }
override fun clearSearch() { override fun clearSearch() {
@@ -45,7 +45,6 @@ import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.kotlin.autoDisposable import com.uber.autodispose.kotlin.autoDisposable
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom import io.reactivex.rxkotlin.withLatestFrom
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
@@ -115,36 +114,32 @@ class MainViewModel @Inject constructor(
override fun bindView(view: MainView) { override fun bindView(view: MainView) {
super.bindView(view) super.bindView(view)
if (!permissionManager.hasReadSms() || !permissionManager.hasContacts()) { when {
view.requestPermissions() !permissionManager.isDefaultSms() -> navigator.showDefaultSmsDialog()
!permissionManager.hasReadSms() || !permissionManager.hasContacts() -> view.requestPermissions()
} }
// If the default SMS state or permission states change, update the ViewState val permissions = view.activityResumedIntent
view.activityResumedIntent
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.map { Triple(permissionManager.isDefaultSms(), permissionManager.hasReadSms(), permissionManager.hasContacts()) } .map { Triple(permissionManager.isDefaultSms(), permissionManager.hasReadSms(), permissionManager.hasContacts()) }
.distinctUntilChanged() .distinctUntilChanged()
.share()
// If the default SMS state or permission states change, update the ViewState
permissions
.doOnNext { (defaultSms, smsPermission, contactPermission) -> .doOnNext { (defaultSms, smsPermission, contactPermission) ->
newState { copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) } newState { copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) }
} }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe() .subscribe()
// If the SMS permission state changes from false to true, sync messages // If we go from not having all permissions to having them, sync messages
view.activityResumedIntent permissions
.observeOn(Schedulers.io())
.map { permissionManager.hasReadSms() }
.distinctUntilChanged()
.skip(1) .skip(1)
.filter { hasSms -> hasSms } .filter { it.first && it.second && it.third }
.take(1) .take(1)
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { .subscribe { syncMessages.execute(Unit) }
syncMessages.execute(Unit)
if (!permissionManager.isDefaultSms()) {
navigator.showDefaultSmsDialog()
}
}
view.queryChangedIntent view.queryChangedIntent
.debounce(200, TimeUnit.MILLISECONDS) .debounce(200, TimeUnit.MILLISECONDS)
@@ -325,8 +320,8 @@ class MainViewModel @Inject constructor(
view.snackbarButtonIntent view.snackbarButtonIntent
.withLatestFrom(state) { _, state -> .withLatestFrom(state) { _, state ->
when { when {
!state.smsPermission -> view.requestPermissions()
!state.defaultSms -> navigator.showDefaultSmsDialog() !state.defaultSms -> navigator.showDefaultSmsDialog()
!state.smsPermission -> view.requestPermissions()
!state.contactPermission -> view.requestPermissions() !state.contactPermission -> view.requestPermissions()
} }
} }