Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-23 08:09:54 +01:00
Code Issues Projects Releases Wiki Activity

make add nearby contact stuff public

Browse Source
This commit is contained in:
ameba23
2021-03-25 20:42:43 +01:00
parent a0df8ded69
commit fc909a317e
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactFragment.java
View File

@@ -45,7 +45,7 @@ import static org.briarproject.bramble.util.LogUtils.logException;
public class AddNearbyContactFragment extends BaseFragment public class AddNearbyContactFragment extends BaseFragment
implements QrCodeView.FullscreenListener { implements QrCodeView.FullscreenListener {
static final String TAG = AddNearbyContactFragment.class.getName(); public static final String TAG = AddNearbyContactFragment.class.getName();
private static final Logger LOG = Logger.getLogger(TAG); private static final Logger LOG = Logger.getLogger(TAG);

12
briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/AddNearbyContactPermissionManager.java
View File

@@ -19,7 +19,7 @@ import static androidx.core.app.ActivityCompat.shouldShowRequestPermissionRation
import static androidx.core.content.ContextCompat.checkSelfPermission; import static androidx.core.content.ContextCompat.checkSelfPermission;
import static org.briarproject.briar.android.util.UiUtils.getGoToSettingsListener; import static org.briarproject.briar.android.util.UiUtils.getGoToSettingsListener;
class AddNearbyContactPermissionManager { public class AddNearbyContactPermissionManager {
private enum Permission { private enum Permission {
UNKNOWN, GRANTED, SHOW_RATIONALE, PERMANENTLY_DENIED UNKNOWN, GRANTED, SHOW_RATIONALE, PERMANENTLY_DENIED
@@ -32,7 +32,7 @@ class AddNearbyContactPermissionManager {
private final Consumer<String[]> requestPermissions; private final Consumer<String[]> requestPermissions;
private final boolean isBluetoothSupported; private final boolean isBluetoothSupported;
AddNearbyContactPermissionManager(BaseActivity ctx, public AddNearbyContactPermissionManager(BaseActivity ctx,
Consumer<String[]> requestPermissions, Consumer<String[]> requestPermissions,
boolean isBluetoothSupported) { boolean isBluetoothSupported) {
this.ctx = ctx; this.ctx = ctx;
@@ -40,12 +40,12 @@ class AddNearbyContactPermissionManager {
this.isBluetoothSupported = isBluetoothSupported; this.isBluetoothSupported = isBluetoothSupported;
} }
void resetPermissions() { public void resetPermissions() {
cameraPermission = Permission.UNKNOWN; cameraPermission = Permission.UNKNOWN;
locationPermission = Permission.UNKNOWN; locationPermission = Permission.UNKNOWN;
} }
static boolean areEssentialPermissionsGranted(Context ctx, public static boolean areEssentialPermissionsGranted(Context ctx,
boolean isBluetoothSupported) { boolean isBluetoothSupported) {
int ok = PERMISSION_GRANTED; int ok = PERMISSION_GRANTED;
return checkSelfPermission(ctx, CAMERA) == ok && return checkSelfPermission(ctx, CAMERA) == ok &&
@@ -60,7 +60,7 @@ class AddNearbyContactPermissionManager {
!isBluetoothSupported); !isBluetoothSupported);
} }
boolean checkPermissions() { public boolean checkPermissions() {
if (areEssentialPermissionsGranted()) return true; if (areEssentialPermissionsGranted()) return true;
// If an essential permission has been permanently denied, ask the // If an essential permission has been permanently denied, ask the
// user to change the setting // user to change the setting
@@ -123,7 +123,7 @@ class AddNearbyContactPermissionManager {
requestPermissions.accept(permissions); requestPermissions.accept(permissions);
} }
void onRequestPermissionResult(Map<String, Boolean> result, public void onRequestPermissionResult(Map<String, Boolean> result,
Runnable onPermissionsGranted) { Runnable onPermissionsGranted) {
if (gotPermission(CAMERA, result)) { if (gotPermission(CAMERA, result)) {
cameraPermission = Permission.GRANTED; cameraPermission = Permission.GRANTED;

6
briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeDecoder.java
View File

@@ -32,7 +32,7 @@ import static java.util.logging.Logger.getLogger;
@MethodsNotNullByDefault @MethodsNotNullByDefault
@ParametersNotNullByDefault @ParametersNotNullByDefault
class QrCodeDecoder implements PreviewConsumer, PreviewCallback { public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
private static final Logger LOG = getLogger(QrCodeDecoder.class.getName()); private static final Logger LOG = getLogger(QrCodeDecoder.class.getName());
@@ -44,7 +44,7 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
private Camera camera = null; private Camera camera = null;
private int cameraIndex = 0; private int cameraIndex = 0;
QrCodeDecoder(AndroidExecutor androidExecutor, public QrCodeDecoder(AndroidExecutor androidExecutor,
@IoExecutor Executor ioExecutor, ResultCallback callback) { @IoExecutor Executor ioExecutor, ResultCallback callback) {
this.androidExecutor = androidExecutor; this.androidExecutor = androidExecutor;
this.ioExecutor = ioExecutor; this.ioExecutor = ioExecutor;
@@ -127,7 +127,7 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
} }
@NotNullByDefault @NotNullByDefault
interface ResultCallback { public interface ResultCallback {
@IoExecutor @IoExecutor
void onQrCodeDecoded(Result result); void onQrCodeDecoded(Result result);
} }

4
briar-android/src/main/java/org/briarproject/briar/android/contact/add/nearby/QrCodeUtils.java
View File

@@ -22,12 +22,12 @@ import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
@NotNullByDefault @NotNullByDefault
class QrCodeUtils { public class QrCodeUtils {
private static final Logger LOG = getLogger(QrCodeUtils.class.getName()); private static final Logger LOG = getLogger(QrCodeUtils.class.getName());
@Nullable @Nullable
static Bitmap createQrCode(DisplayMetrics dm, String input) { public static Bitmap createQrCode(DisplayMetrics dm, String input) {
int smallestDimen = Math.min(dm.widthPixels, dm.heightPixels); int smallestDimen = Math.min(dm.widthPixels, dm.heightPixels);
try { try {
// Generate QR code // Generate QR code