Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #13299: Enable the camera only if permission is granted #13305

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −1
Open

Fixes #13299: Enable the camera only if permission is granted #13305

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java
View file
Open in desktop
@@ -1,7 +1,9 @@
package org.thoughtcrime.securesms.mediasend;

import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Point;
import android.net.Uri;
import android.os.Bundle;
Expand All @@ -12,6 +14,7 @@
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;

Expand Down Expand Up @@ -214,6 +217,10 @@ private boolean isCameraFirst() {
return !isGalleryFirst();
}

private boolean hasCameraPermission() {
return ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED;
}

private void handleSave() {
ImageEditorFragment fragment = (ImageEditorFragment) getSupportFragmentManager().findFragmentByTag(IMAGE_EDITOR);
if (fragment == null) {
Expand Down Expand Up @@ -284,6 +291,6 @@ public void onToolbarNavigationClicked() {

@Override
public boolean isCameraEnabled() {
return true;
return hasCameraPermission();
}
}