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

Commit b5679f94 authored by LuK1337's avatar LuK1337
Browse files

Recorder: Drop WRITE_EXTERNAL_STORAGE permission 

* WRITE_EXTERNAL_STORAGE is deprecated and no longer
  necessary now that we are writing to getExternalFilesDir()

Change-Id: Ie86fd151ce4053308d7f85bff90391c8dca4a56e
parent 3850e02c

app/src/main/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />



    <!-- This is needed for aosp build env -->

    <uses-sdk android:minSdkVersion="24"

app/src/main/java/org/lineageos/recorder/RecorderActivity.java

+4 −26
Original line number Diff line number Diff line
@@ -65,12 +65,8 @@ public class RecorderActivity extends AppCompatActivity implements 
    private static final int[] PERMISSION_ERROR_MESSAGE_RES_IDS = {

            0,

            R.string.dialog_permissions_mic,

            R.string.dialog_permissions_storage,

            R.string.dialog_permissions_mic_storage,

            R.string.dialog_permissions_phone,

            R.string.dialog_permissions_mic_phone,

            R.string.dialog_permissions_storage_phone,

            R.string.dialog_permissions_mic_storage_phone

    };



    private ServiceConnection mConnection;
@@ -175,7 +171,6 @@ public class RecorderActivity extends AppCompatActivity implements 
        }



        if (shouldShowRequestPermissionRationale(Manifest.permission.RECORD_AUDIO) ||

                shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE) ||

                shouldShowRequestPermissionRationale(Manifest.permission.READ_PHONE_STATE)) {

            // Explain the user why the denied permission is needed

            int error = 0;
@@ -183,11 +178,8 @@ public class RecorderActivity extends AppCompatActivity implements 
            if (!hasAudioPermission()) {

                error |= 1;

            }

            if (!hasStoragePermission()) {

                error |= 1 << 1;

            }

            if (!hasPhoneReaderPermission()) {

                error |= 1 << 2;

                error |= 1 << 1;

            }



            String message = getString(PERMISSION_ERROR_MESSAGE_RES_IDS[error]);
@@ -329,11 +321,6 @@ public class RecorderActivity extends AppCompatActivity implements 
        set.applyTo(mConstraintRoot);

    }



    private boolean hasStoragePermission() {

        int result = checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);

        return result == PackageManager.PERMISSION_GRANTED;

    }



    private boolean hasAudioPermission() {

        int result = checkSelfPermission(Manifest.permission.RECORD_AUDIO);

        return result == PackageManager.PERMISSION_GRANTED;
@@ -349,20 +336,17 @@ public class RecorderActivity extends AppCompatActivity implements 
    }



    private boolean hasAllAudioRecorderPermissions() {

        return hasStoragePermission() && hasAudioPermission() && hasPhoneReaderPermission();

        return hasAudioPermission() && hasPhoneReaderPermission();

    }



    private boolean hasAllScreenRecorderPermissions() {

        return hasStoragePermission();

        // None for now

        return true;

    }



    private boolean checkSoundRecPermissions() {

        ArrayList<String> permissions = new ArrayList<>();



        if (!hasStoragePermission()) {

            permissions.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);

        }



        if (!hasAudioPermission()) {

            permissions.add(Manifest.permission.RECORD_AUDIO);

        }
@@ -393,12 +377,6 @@ public class RecorderActivity extends AppCompatActivity implements 
            return true;

        }



        if (hasStoragePermission()) {

            return false;

        }



        final String[] perms = {Manifest.permission.WRITE_EXTERNAL_STORAGE};

        requestPermissions(perms, REQUEST_SCREEN_REC_PERMS);

        return true;

    }

app/src/main/res/values/strings.xml

+0 −8
Original line number Diff line number Diff line
@@ -95,18 +95,10 @@ 
    <string name="dialog_permissions_title">Permissions</string>

    <!-- Message: microphone access denied -->

    <string name="dialog_permissions_mic">Recorder needs microphone permission to record audio</string>

    <!-- Message: storage access denied -->

    <string name="dialog_permissions_storage">Recorder needs storage access to save recorded files</string>

    <!-- Message: phone status denied -->

    <string name="dialog_permissions_phone">Recorder needs phone status access to prevent this app from recording while you\'re calling</string>

    <!-- Message: microphone and storage access denied -->

    <string name="dialog_permissions_mic_storage">Recorder needs microphone permission to record audio and storage access to save recorded files</string>

    <!-- Message: microphone and phone status access denied -->

    <string name="dialog_permissions_mic_phone">Recorder needs microphone permission to record audio and phone status access to prevent this app from recording while you\'re calling</string>

    <!-- Message: storage and phone status access denied -->

    <string name="dialog_permissions_storage_phone">Recorder needs storage access to save recorded files and phone status access to prevent this app from recording while you\'re calling</string>

    <!-- Message: microphone, storage and phone status access denied -->

    <string name="dialog_permissions_mic_storage_phone">Recorder needs microphone permission to record audio, storage access to save recorded files and phone status access to prevent this app from recording while you\'re calling</string>

    <!-- Permissions dialog action: ask permissions access again -->

    <string name="dialog_permissions_ask">Ask again</string>

    <!-- Permissions dialog action: dismiss dialog -->