Ask for permissions in SetupActivity

This commit is contained in:
Moez Bhatti
2017-12-25 19:32:09 -05:00
parent f2eed8a994
commit fa3c767038
18 changed files with 161 additions and 135 deletions
-1
View File
@@ -52,7 +52,6 @@ dependencies {
compile 'com.jakewharton.rxbinding2:rxbinding-kotlin:2.0.0'
compile 'com.jakewharton.rxbinding2:rxbinding-support-v4-kotlin:2.0.0'
compile 'com.jakewharton.timber:timber:4.5.1'
compile 'com.karumi:dexter:4.1.0'
compile 'com.mixpanel.android:mixpanel-android:5.2.1'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile "io.reactivex.rxjava2:rxjava:2.1.4"
+1 -1
View File
@@ -46,7 +46,7 @@
</activity>
<activity android:name="com.moez.QKSMS.presentation.compose.ComposeActivity" />
<activity android:name=".presentation.settings.SettingsActivity" />
<activity android:name=".presentation.defaultsms.DefaultSmsActivity" />
<activity android:name=".presentation.setup.SetupActivity" />
<receiver android:name=".receiver.DefaultSmsChangedReceiver">
<intent-filter>
@@ -6,11 +6,12 @@ import com.moez.QKSMS.presentation.common.widget.*
import com.moez.QKSMS.presentation.compose.ComposeActivity
import com.moez.QKSMS.presentation.compose.ComposeViewModel
import com.moez.QKSMS.presentation.compose.DetailedChipView
import com.moez.QKSMS.presentation.defaultsms.DefaultSmsActivity
import com.moez.QKSMS.presentation.main.MainActivity
import com.moez.QKSMS.presentation.main.MainViewModel
import com.moez.QKSMS.presentation.settings.SettingsActivity
import com.moez.QKSMS.presentation.settings.SettingsViewModel
import com.moez.QKSMS.presentation.setup.SetupActivity
import com.moez.QKSMS.presentation.setup.SetupViewModel
import com.moez.QKSMS.receiver.*
import dagger.Component
import javax.inject.Singleton
@@ -22,7 +23,7 @@ interface AppComponent {
fun inject(application: QKApplication)
fun inject(activity: MainActivity)
fun inject(activity: DefaultSmsActivity)
fun inject(activity: SetupActivity)
fun inject(activity: ComposeActivity)
fun inject(activity: SettingsActivity)
@@ -42,6 +43,7 @@ interface AppComponent {
fun inject(view: Separator)
fun inject(viewModel: MainViewModel)
fun inject(viewModel: SetupViewModel)
fun inject(viewModel: ComposeViewModel)
fun inject(viewModel: SettingsViewModel)
@@ -0,0 +1,14 @@
package com.moez.QKSMS.common.util
import android.Manifest
import android.content.Context
import android.content.pm.PackageManager
import android.support.v4.content.ContextCompat
import javax.inject.Inject
class Permissions @Inject constructor(private val context: Context) {
fun hasSmsAndContacts() = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_SMS) == PackageManager.PERMISSION_GRANTED &&
ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED
}
@@ -1,15 +1,20 @@
package com.moez.QKSMS.domain.interactor
import com.moez.QKSMS.common.util.Permissions
import com.moez.QKSMS.common.util.SyncManager
import io.reactivex.Flowable
import timber.log.Timber
import java.util.concurrent.TimeUnit
import javax.inject.Inject
open class PartialSync @Inject constructor(private val syncManager: SyncManager) : Interactor<Unit, Long>() {
open class PartialSync @Inject constructor(
private val syncManager: SyncManager,
private val permissions: Permissions
) : Interactor<Unit, Long>() {
override fun buildObservable(params: Unit): Flowable<Long> {
return Flowable.just(System.currentTimeMillis())
.skipWhile { !permissions.hasSmsAndContacts() }
.doOnNext { syncManager.performSync() }
.map { startTime -> System.currentTimeMillis() - startTime }
.map { elapsed -> TimeUnit.MILLISECONDS.toSeconds(elapsed) }
@@ -11,11 +11,11 @@ import android.provider.Settings
import com.moez.QKSMS.common.util.NotificationManager
import com.moez.QKSMS.presentation.compose.ComposeActivity
import com.moez.QKSMS.presentation.compose.ComposeViewModel
import com.moez.QKSMS.presentation.defaultsms.DefaultSmsActivity
import com.moez.QKSMS.presentation.defaultsms.DefaultSmsViewModel
import com.moez.QKSMS.presentation.main.MainViewModel
import com.moez.QKSMS.presentation.settings.SettingsActivity
import com.moez.QKSMS.presentation.settings.SettingsViewModel
import com.moez.QKSMS.presentation.setup.SetupActivity
import com.moez.QKSMS.presentation.setup.SetupViewModel
import javax.inject.Inject
import javax.inject.Singleton
@@ -28,8 +28,8 @@ class Navigator @Inject constructor(val context: Context) {
context.startActivity(intent)
}
fun showDefaultSmsActivity() {
val intent = Intent(context, DefaultSmsActivity::class.java)
fun showSetupActivity() {
val intent = Intent(context, SetupActivity::class.java)
startActivity(intent)
}
@@ -73,8 +73,8 @@ class Navigator @Inject constructor(val context: Context) {
MainViewModel()
}
DefaultSmsViewModel::class.java -> {
DefaultSmsViewModel()
SetupViewModel::class.java -> {
SetupViewModel()
}
ComposeViewModel::class.java -> {
@@ -1,52 +0,0 @@
package com.moez.QKSMS.presentation.defaultsms
import android.content.Intent
import android.os.Bundle
import android.provider.Telephony
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.appComponent
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.default_sms_activity.*
class DefaultSmsActivity : QkActivity<DefaultSmsViewModel>(), DefaultSmsView {
override val viewModelClass = DefaultSmsViewModel::class
override val skipIntent by lazy { skip.clicks() }
override val nextIntent by lazy { next.clicks() }
override val defaultSmsSetIntent: Subject<Boolean> = PublishSubject.create()
init {
appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.default_sms_activity)
viewModel.bindView(this)
disposables += colors.background
.subscribe { color -> window.decorView.setBackgroundColor(color) }
}
override fun onResume() {
super.onResume()
defaultSmsSetIntent.onNext(Telephony.Sms.getDefaultSmsPackage(this) == packageName)
}
override fun render(state: DefaultSmsState) {
if (state.requestPermission) {
val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, packageName)
startActivity(intent)
}
if (state.finished) {
finish()
}
}
}
@@ -1,6 +0,0 @@
package com.moez.QKSMS.presentation.defaultsms
data class DefaultSmsState(
val requestPermission: Boolean = false,
val finished: Boolean = false
)
@@ -1,12 +0,0 @@
package com.moez.QKSMS.presentation.defaultsms
import com.moez.QKSMS.presentation.common.base.QkView
import io.reactivex.Observable
interface DefaultSmsView : QkView<DefaultSmsState> {
val skipIntent: Observable<*>
val nextIntent: Observable<*>
val defaultSmsSetIntent: Observable<Boolean>
}
@@ -1,21 +0,0 @@
package com.moez.QKSMS.presentation.defaultsms
import com.moez.QKSMS.presentation.common.base.QkViewModel
import io.reactivex.rxkotlin.plusAssign
class DefaultSmsViewModel : QkViewModel<DefaultSmsView, DefaultSmsState>(DefaultSmsState()) {
override fun bindView(view: DefaultSmsView) {
super.bindView(view)
intents += view.skipIntent
.subscribe { newState { it.copy(finished = true) } }
intents += view.nextIntent
.subscribe { newState { it.copy(requestPermission = true) } }
intents += view.defaultSmsSetIntent
.subscribe { isDefault -> newState { it.copy(requestPermission = false, finished = isDefault) } }
}
}
@@ -1,6 +1,5 @@
package com.moez.QKSMS.presentation.main
import android.Manifest
import android.app.AlertDialog
import android.content.Intent
import android.content.res.ColorStateList
@@ -16,11 +15,6 @@ import android.view.Gravity
import com.jakewharton.rxbinding2.support.v4.widget.drawerOpen
import com.jakewharton.rxbinding2.view.clicks
import com.jakewharton.rxbinding2.widget.textChanges
import com.karumi.dexter.Dexter
import com.karumi.dexter.MultiplePermissionsReport
import com.karumi.dexter.PermissionToken
import com.karumi.dexter.listener.PermissionRequest
import com.karumi.dexter.listener.multi.MultiplePermissionsListener
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.extensions.dpToPx
@@ -37,7 +31,6 @@ import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.drawer_view.*
import kotlinx.android.synthetic.main.main_activity.*
import kotlinx.android.synthetic.main.toolbar_search.*
import timber.log.Timber
import javax.inject.Inject
class MainActivity : QkActivity<MainViewModel>(), MainView {
@@ -88,7 +81,6 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.main_activity)
requestPermissions()
viewModel.bindView(this)
toolbarSearch.setHint(R.string.title_conversations)
@@ -226,19 +218,4 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
else if (!conversationMenuDialog.isShowing && menuItemAdapter.data.isNotEmpty()) conversationMenuDialog.show()
}
private fun requestPermissions() {
Dexter.withActivity(this)
.withPermissions(arrayListOf(Manifest.permission.READ_CONTACTS, Manifest.permission.READ_SMS))
.withListener(object : MultiplePermissionsListener {
override fun onPermissionRationaleShouldBeShown(request: MutableList<PermissionRequest>, token: PermissionToken) {
}
override fun onPermissionsChecked(report: MultiplePermissionsReport) {
for (response in report.grantedPermissionResponses) Timber.v("Permission granted: ${response.permissionName}")
for (response in report.deniedPermissionResponses) Timber.v("Permission denied: ${response.permissionName}")
}
})
.check()
}
}
@@ -1,7 +1,10 @@
package com.moez.QKSMS.presentation.main
import android.Manifest
import android.content.Context
import android.content.pm.PackageManager
import android.provider.Telephony
import android.support.v4.content.ContextCompat
import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.filter.ConversationFilter
@@ -58,11 +61,18 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
newState { it.copy(page = Inbox(data = messageRepo.getConversations())) }
if (Telephony.Sms.getDefaultSmsPackage(context) != context.packageName) {
navigator.showDefaultSmsActivity()
val isDefaultSms = Telephony.Sms.getDefaultSmsPackage(context) != context.packageName
val hasSmsPermission = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_SMS) == PackageManager.PERMISSION_GRANTED
val hasContactPermission = ContextCompat.checkSelfPermission(context, Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED
if (isDefaultSms) {
partialSync.execute(Unit)
}
if (isDefaultSms || !hasSmsPermission || !hasContactPermission) {
navigator.showSetupActivity()
}
markAllSeen.execute(Unit)
}
@@ -0,0 +1,55 @@
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.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.*
class SetupActivity : QkActivity<SetupViewModel>(), SetupView {
override val viewModelClass = SetupViewModel::class
override val activityResumedIntent: Subject<Unit> = PublishSubject.create()
override val skipIntent by lazy { skip.clicks() }
override val nextIntent by lazy { next.clicks() }
init {
appComponent.inject(this)
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.setup_activity)
viewModel.bindView(this)
disposables += colors.background
.subscribe { color -> window.decorView.setBackgroundColor(color) }
}
override fun onResume() {
super.onResume()
activityResumedIntent.onNext(Unit)
}
override fun render(state: SetupState) {
}
override fun requestDefaultSms() {
val intent = Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT)
intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, packageName)
startActivity(intent)
}
override fun requestPermissions() {
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.READ_CONTACTS, Manifest.permission.READ_SMS), 0)
}
}
@@ -0,0 +1,3 @@
package com.moez.QKSMS.presentation.setup
class SetupState
@@ -0,0 +1,16 @@
package com.moez.QKSMS.presentation.setup
import com.moez.QKSMS.presentation.common.base.QkView
import io.reactivex.Observable
interface SetupView : QkView<SetupState> {
val activityResumedIntent: Observable<*>
val skipIntent: Observable<*>
val nextIntent: Observable<*>
fun requestDefaultSms()
fun requestPermissions()
fun finish()
}
@@ -0,0 +1,36 @@
package com.moez.QKSMS.presentation.setup
import android.content.Context
import android.provider.Telephony
import com.moez.QKSMS.common.di.appComponent
import com.moez.QKSMS.common.util.Permissions
import com.moez.QKSMS.presentation.common.base.QkViewModel
import io.reactivex.rxkotlin.plusAssign
import javax.inject.Inject
class SetupViewModel : QkViewModel<SetupView, SetupState>(SetupState()) {
@Inject lateinit var context: Context
@Inject lateinit var permissions: Permissions
init {
appComponent.inject(this)
}
override fun bindView(view: SetupView) {
super.bindView(view)
intents += view.activityResumedIntent
.subscribe {
val isDefault = Telephony.Sms.getDefaultSmsPackage(context) == context.packageName
if (!permissions.hasSmsAndContacts()) view.requestPermissions()
else if (isDefault) view.finish()
}
intents += view.skipIntent.subscribe { view.finish() }
intents += view.nextIntent.subscribe { view.requestDefaultSms() }
}
}
@@ -15,7 +15,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/default_sms_title"
android:text="@string/setup_title"
android:textSize="20sp"
app:textColor="primary" />
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center"
android:text="@string/default_sms_summary"
android:text="@string/setup_summary"
android:textSize="14sp"
app:textColor="tertiary" />
@@ -44,7 +44,7 @@
android:layout_weight="1"
android:background="@drawable/ripple"
android:gravity="center"
android:text="@string/default_sms_skip"
android:text="@string/setup_skip"
android:textAllCaps="true"
android:textSize="14sp"
android:textStyle="bold"
@@ -57,7 +57,7 @@
android:layout_weight="1"
android:background="@drawable/ripple"
android:gravity="center"
android:text="@string/default_sms_next"
android:text="@string/setup_next"
android:textAllCaps="true"
android:textSize="14sp"
android:textStyle="bold"
+4 -4
View File
@@ -9,10 +9,10 @@
<string name="title_conversations">Search inbox…</string>
<string name="title_compose">Type a name or number</string>
<string name="default_sms_title">Love texting again</string>
<string name="default_sms_summary">Make QKSMS your default SMS app</string>
<string name="default_sms_skip">Skip</string>
<string name="default_sms_next">Continue</string>
<string name="setup_title">Love texting again</string>
<string name="setup_summary">Make QKSMS your default SMS app</string>
<string name="setup_skip">Skip</string>
<string name="setup_next">Continue</string>
<string name="menu_call">Call</string>
<string name="menu_archive">Archive conversation</string>