forked from upstream-mirrors/quik
Request SMS permission when sending message
This commit is contained in:
@@ -248,6 +248,12 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
|
||||
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), 0)
|
||||
}
|
||||
|
||||
override fun requestSmsPermission() {
|
||||
ActivityCompat.requestPermissions(this, arrayOf(
|
||||
Manifest.permission.READ_SMS,
|
||||
Manifest.permission.SEND_SMS), 0)
|
||||
}
|
||||
|
||||
override fun requestDatePicker() {
|
||||
val calendar = Calendar.getInstance()
|
||||
DatePickerDialog(this, DatePickerDialog.OnDateSetListener { _, year, month, day ->
|
||||
|
||||
@@ -60,6 +60,7 @@ interface ComposeView : QkView<ComposeState> {
|
||||
fun clearSelection()
|
||||
fun showDetails(details: String)
|
||||
fun requestStoragePermission()
|
||||
fun requestSmsPermission()
|
||||
fun requestCamera()
|
||||
fun requestGallery()
|
||||
fun requestDatePicker()
|
||||
|
||||
@@ -571,6 +571,11 @@ class ComposeViewModel @Inject constructor(
|
||||
|
||||
// Send a message when the send button is clicked, and disable editing mode if it's enabled
|
||||
view.sendIntent
|
||||
.filter {
|
||||
val hasPermission = permissionManager.hasSendSms()
|
||||
if (!hasPermission) view.requestSmsPermission()
|
||||
hasPermission
|
||||
}
|
||||
.withLatestFrom(view.textChangedIntent) { _, body -> body }
|
||||
.map { body -> body.toString() }
|
||||
.withLatestFrom(state, attachments, conversation, selectedContacts) { body, state, attachments, conversation, contacts ->
|
||||
|
||||
@@ -281,7 +281,10 @@ class MainActivity : QkThemedActivity(), MainView {
|
||||
}
|
||||
|
||||
override fun requestPermissions() {
|
||||
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.READ_CONTACTS, Manifest.permission.READ_SMS), 0)
|
||||
ActivityCompat.requestPermissions(this, arrayOf(
|
||||
Manifest.permission.READ_CONTACTS,
|
||||
Manifest.permission.READ_SMS,
|
||||
Manifest.permission.SEND_SMS), 0)
|
||||
}
|
||||
|
||||
override fun clearSearch() {
|
||||
|
||||
@@ -103,7 +103,7 @@ class MainViewModel @Inject constructor(
|
||||
// If we have all permissions and we've never run a sync, run a sync. This will be the case
|
||||
// when upgrading from 2.7.3, or if the app's data was cleared
|
||||
val lastSync = Realm.getDefaultInstance().use { realm -> realm.where(SyncLog::class.java)?.max("date") ?: 0 }
|
||||
if (lastSync == 0 && permissionManager.isDefaultSms() && permissionManager.hasSmsAndContacts()) {
|
||||
if (lastSync == 0 && permissionManager.isDefaultSms() && permissionManager.hasReadSms() && permissionManager.hasContacts()) {
|
||||
syncMessages.execute(Unit)
|
||||
}
|
||||
|
||||
@@ -114,14 +114,14 @@ class MainViewModel @Inject constructor(
|
||||
override fun bindView(view: MainView) {
|
||||
super.bindView(view)
|
||||
|
||||
if (!permissionManager.hasSmsAndContacts()) {
|
||||
if (!permissionManager.hasReadSms() || !permissionManager.hasContacts()) {
|
||||
view.requestPermissions()
|
||||
}
|
||||
|
||||
// If the default SMS state or permission states change, update the ViewState
|
||||
Observables.combineLatest(
|
||||
view.activityResumedIntent.map { permissionManager.isDefaultSms() }.distinctUntilChanged(),
|
||||
view.activityResumedIntent.map { permissionManager.hasSms() }.distinctUntilChanged(),
|
||||
view.activityResumedIntent.map { permissionManager.hasReadSms() }.distinctUntilChanged(),
|
||||
view.activityResumedIntent.map { permissionManager.hasContacts() }.distinctUntilChanged())
|
||||
{ defaultSms, smsPermission, contactPermission ->
|
||||
newState { copy(defaultSms = defaultSms, smsPermission = smsPermission, contactPermission = contactPermission) }
|
||||
@@ -131,7 +131,7 @@ class MainViewModel @Inject constructor(
|
||||
|
||||
// If the SMS permission state changes from false to true, sync messages
|
||||
view.activityResumedIntent
|
||||
.map { permissionManager.hasSms() }
|
||||
.map { permissionManager.hasReadSms() }
|
||||
.distinctUntilChanged()
|
||||
.skip(1)
|
||||
.filter { hasSms -> hasSms }
|
||||
|
||||
Reference in New Issue
Block a user