jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Minor TLS config improvements.

Browse Source
This commit is contained in:
Juha Heinanen
2019-08-25 12:54:05 +03:00
parent 7106b7eb74
commit 20567b0870
4 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+4 -10
View File
@@ -209,12 +209,9 @@ class ConfigActivity : AppCompatActivity() {
if (certificateFile.isChecked != oldCertificateFile) {
if (certificateFile.isChecked) {
if (!Utils.checkPermission(applicationContext,
android.Manifest.permission.READ_EXTERNAL_STORAGE)) {
Utils.alertView(this, getString(R.string.error),
getString(R.string.no_storage_space_permission))
if (!Utils.requestPermission(this,
android.Manifest.permission.READ_EXTERNAL_STORAGE))
return false
}
val content = Utils.getFileContents(File(downloadsDir, "cert.pem"))
if (content == "Failed") {
Utils.alertView(this, getString(R.string.error),
@@ -234,12 +231,9 @@ class ConfigActivity : AppCompatActivity() {
if (caFile.isChecked != oldCAFile) {
if (caFile.isChecked) {
if (!Utils.checkPermission(applicationContext,
android.Manifest.permission.READ_EXTERNAL_STORAGE)) {
Utils.alertView(this, getString(R.string.error),
getString(R.string.no_storage_space_permission))
if (!Utils.requestPermission(this,
android.Manifest.permission.READ_EXTERNAL_STORAGE))
return false
}
val content = Utils.getFileContents(File(downloadsDir, "ca_certs.crt"))
if (content == "Failed") {
Utils.alertView(this, getString(R.string.error),
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
-4
View File
@@ -320,10 +320,6 @@ object Utils {
}
}
fun checkPermission(ctx: Context, permission: String) : Boolean {
return ContextCompat.checkSelfPermission(ctx, permission) == PackageManager.PERMISSION_GRANTED
}
fun requestPermission(ctx: Context, permission: String) : Boolean {
if (ContextCompat.checkSelfPermission(ctx, permission) != PackageManager.PERMISSION_GRANTED) {
Log.w("Baresip", "Baresip does not have $permission permission")