erik/TESRemoteProgrammer
erik/TESRemoteProgrammer
1
0
Fork 0
Code Issues Pull requests Releases Activity

PremissionsDispatcher 3.0.1

Browse source
This commit is contained in:
Erik C. Thauvin 2017-10-27 12:36:16 -07:00
parent 7572619921
commit 59bed44817
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/build.gradle
View file

@ -48,16 +48,14 @@ dependencies {
compile 'com.github.AndroidDeveloperLB:AutoFitTextView:4'
// https://github.com/hotchemi/PermissionsDispatcher
compile 'com.github.hotchemi:permissionsdispatcher:2.4.0'
kapt 'com.github.hotchemi:permissionsdispatcher-processor:2.4.0'
compile 'com.github.hotchemi:permissionsdispatcher:3.0.1'
kapt 'com.github.hotchemi:permissionsdispatcher-processor:3.0.1'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
// https://github.com/eggheadgames/android-about-box
compile 'com.github.eggheadgames:android-about-box:1.3.1'
//compile(name: 'library-debug', ext: 'aar')
//compile 'com.github.daniel-stoneuk:material-about-library:2.2.1'
compile 'com.android.support:animated-vector-drawable:26.0.1'
compile 'com.android.support:cardview-v7:26.0.1'
compile 'com.android.support:animated-vector-drawable:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0'

6
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
View file

@ -18,6 +18,7 @@
package net.thauvin.erik.android.tesremoteprogrammer
import android.Manifest
import android.annotation.SuppressLint
import android.app.Activity
import android.app.AlertDialog
import android.content.Context
@ -186,7 +187,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
if (requestCode == readRequestCode && resultCode == Activity.RESULT_OK) {
if (data != null) {
MainActivityPermissionsDispatcher.importConfigWithCheck(this, data)
importConfigWithPermissionCheck(data)
}
}
}
@ -354,11 +355,12 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
return super.onOptionsItemSelected(item)
}
@SuppressLint("NeedOnRequestPermissionsResult")
override fun onRequestPermissionsResult(requestCode: Int,
permissions: Array<out String>,
grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
MainActivityPermissionsDispatcher.onRequestPermissionsResult(this, requestCode, grantResults)
onRequestPermissionsResult(requestCode, grantResults)
}
fun loadConfigurations(): Configurations {

7
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
View file

@ -18,6 +18,7 @@
package net.thauvin.erik.android.tesremoteprogrammer
import android.Manifest
import android.annotation.SuppressLint
import android.content.Context
import android.content.res.ColorStateList
import android.graphics.Color
@ -228,8 +229,7 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
if (validateFields(params.type, fields, option)) {
val dtmf = Dtmf.build(params.type, params.master, params.ack, option, fields)
if (Dtmf.validate(dtmf, "${MainActivity.PAUSE}${params.ack}${params.alt}", option.nodial)) {
ProgrammingActivityPermissionsDispatcher.callWithCheck(
this@ProgrammingActivity, params.phone, dtmf)
callWithPermissionCheck(params.phone, dtmf)
} else {
Snackbar.make(this@coordinatorLayout,
getString(R.string.error_invalid_dtmf, dtmf),
@ -244,11 +244,12 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
}
}
@SuppressLint("NeedOnRequestPermissionsResult")
override fun onRequestPermissionsResult(requestCode: Int,
permissions: Array<out String>,
grantResults: IntArray) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
ProgrammingActivityPermissionsDispatcher.onRequestPermissionsResult(this, requestCode, grantResults)
onRequestPermissionsResult(requestCode, grantResults)
}
@NeedsPermission(Manifest.permission.CALL_PHONE)