Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2abe164e authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Don't use shouldShowRequestPermissionRationale in debug info (crashes on... 

Don't use shouldShowRequestPermissionRationale in debug info (crashes on Motorola Android 6 when permission name is unknown)
parent fa585660

app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt

+6 −10
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ import android.util.Log 
import android.view.Menu

import android.view.Menu

import android.view.MenuItem

import android.view.MenuItem

import androidx.appcompat.app.AppCompatActivity

import androidx.appcompat.app.AppCompatActivity

import androidx.core.app.ActivityCompat

import androidx.core.app.ShareCompat

import androidx.core.app.ShareCompat

import androidx.core.content.ContextCompat

import androidx.core.content.ContextCompat

import androidx.core.content.FileProvider

import androidx.core.content.FileProvider
@@ -255,14 +254,11 @@ class DebugInfoActivity: AppCompatActivity(), LoaderManager.LoaderCallbacks<Stri 
                                       TaskProvider.PERMISSION_READ_TASKS, TaskProvider.PERMISSION_WRITE_TASKS,

                                       TaskProvider.PERMISSION_READ_TASKS, TaskProvider.PERMISSION_WRITE_TASKS,

                                       Manifest.permission.ACCESS_COARSE_LOCATION)) {

                                       Manifest.permission.ACCESS_COARSE_LOCATION)) {

                report  .append(permission).append(": ")

                report  .append(permission).append(": ")

                if (ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED)

                        .append(if (ContextCompat.checkSelfPermission(context, permission) == PackageManager.PERMISSION_GRANTED)

                    report.append("granted")

                            "granted"

                else {

                        else

                    report.append("denied")

                            "denied")

                    if (!ActivityCompat.shouldShowRequestPermissionRationale(activity, permission))

                        .append("\n")

                        report.append(" & won't ask again")

                }

                report.append("\n")

            }

            }

            // system-wide sync settings

            // system-wide sync settings

            report.append("System-wide synchronization: ")

            report.append("System-wide synchronization: ")