Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Code cleanup, shortened button text to help with layout.

Browse Source
This commit is contained in:
akwizgran
2017-10-10 11:31:27 +01:00
parent 49052be627
commit 8454b2d235
2 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
View File

@@ -1,10 +1,7 @@
package org.briarproject.briar.android.keyagreement; package org.briarproject.briar.android.keyagreement;
import android.Manifest;
import android.Manifest.permission;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
@@ -42,7 +39,8 @@ import java.util.logging.Logger;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.inject.Inject; import javax.inject.Inject;
import static android.support.v4.content.PermissionChecker.PERMISSION_GRANTED; import static android.Manifest.permission.CAMERA;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.widget.Toast.LENGTH_LONG; import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PERMISSION_CAMERA; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PERMISSION_CAMERA;
@@ -115,7 +113,8 @@ public class KeyAgreementActivity extends BriarActivity implements
@Override @Override
protected void onPostResume() { protected void onPostResume() {
super.onPostResume(); super.onPostResume();
//Workaround for https://code.google.com/p/android/issues/detail?id=190966 // Workaround for
// https://code.google.com/p/android/issues/detail?id=190966
if (continueClicked && gotCameraPermission) { if (continueClicked && gotCameraPermission) {
showQrCodeFragment(); showQrCodeFragment();
} }
@@ -124,7 +123,7 @@ public class KeyAgreementActivity extends BriarActivity implements
@Override @Override
public void showNextScreen() { public void showNextScreen() {
// FIXME #824 // FIXME #824
// showNextFragment(ShowQrCodeFragment.newInstance()); // showNextFragment(ShowQrCodeFragment.newInstance());
continueClicked = true; continueClicked = true;
if (checkPermissions()) { if (checkPermissions()) {
showQrCodeFragment(); showQrCodeFragment();
@@ -140,12 +139,12 @@ public class KeyAgreementActivity extends BriarActivity implements
} }
private boolean checkPermissions() { private boolean checkPermissions() {
if (ContextCompat.checkSelfPermission(this, permission.CAMERA) != if (ContextCompat.checkSelfPermission(this, CAMERA) !=
PackageManager.PERMISSION_GRANTED) { PERMISSION_GRANTED) {
// Should we show an explanation? // Should we show an explanation?
if (ActivityCompat.shouldShowRequestPermissionRationale(this, if (ActivityCompat.shouldShowRequestPermissionRationale(this,
permission.CAMERA)) { CAMERA)) {
OnClickListener proceedListener = new OnClickListener() { OnClickListener continueListener = new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
requestPermission(); requestPermission();
@@ -153,9 +152,9 @@ public class KeyAgreementActivity extends BriarActivity implements
}; };
Builder builder = new Builder(this, style.BriarDialogTheme); Builder builder = new Builder(this, style.BriarDialogTheme);
builder.setTitle(string.permission_camera_title); builder.setTitle(string.permission_camera_title);
builder.setMessage(string.permission_camera_request_text); builder.setMessage(string.permission_camera_request_body);
builder.setNeutralButton(string.continue_button, builder.setNeutralButton(string.continue_button,
proceedListener); continueListener);
builder.show(); builder.show();
} else { } else {
requestPermission(); requestPermission();
@@ -167,8 +166,7 @@ public class KeyAgreementActivity extends BriarActivity implements
} }
private void requestPermission() { private void requestPermission() {
ActivityCompat.requestPermissions(this, ActivityCompat.requestPermissions(this, new String[] {CAMERA},
new String[] {permission.CAMERA},
REQUEST_PERMISSION_CAMERA); REQUEST_PERMISSION_CAMERA);
} }
@@ -183,22 +181,20 @@ public class KeyAgreementActivity extends BriarActivity implements
gotCameraPermission = true; gotCameraPermission = true;
} else { } else {
if (!ActivityCompat.shouldShowRequestPermissionRationale(this, if (!ActivityCompat.shouldShowRequestPermissionRationale(this,
permission.CAMERA)) { CAMERA)) {
// The user has permanently denied the request
OnClickListener cancelListener = new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
supportFinishAfterTransition();
}
};
Builder builder = new Builder(this, style.BriarDialogTheme); Builder builder = new Builder(this, style.BriarDialogTheme);
builder.setTitle(string.permission_camera_title); builder.setTitle(string.permission_camera_title);
builder.setMessage(string.permission_camera_perm_denied); builder.setMessage(string.permission_camera_denied_body);
builder.setPositiveButton(string.open_settings, builder.setPositiveButton(string.ok,
UiUtils.getGoToSettingsListener( UiUtils.getGoToSettingsListener(this));
this)); builder.setNegativeButton(string.cancel, cancelListener);
builder.setNegativeButton(string.cancel,
new OnClickListener() {
@Override
public void onClick(
DialogInterface dialog,
int which) {
supportFinishAfterTransition();
}
});
builder.show(); builder.show();
} else { } else {
Toast.makeText(this, string.permission_camera_denied_toast, Toast.makeText(this, string.permission_camera_denied_toast,

5
briar-android/src/main/res/values/strings.xml
View File

@@ -383,9 +383,8 @@
<!-- Permission Requests and Doze Mode --> <!-- Permission Requests and Doze Mode -->
<string name="permission_camera_title">Camera permission</string> <string name="permission_camera_title">Camera permission</string>
<string name="permission_camera_request_text">To scan the QR code, Briar needs access to the camera.</string> <string name="permission_camera_request_body">To scan the QR code, Briar needs access to the camera.</string>
<string name="permission_camera_perm_denied">You have denied access to the camera, but adding contacts requires using the camera. Please consider granting access.</string> <string name="permission_camera_denied_body">You have denied access to the camera, but adding contacts requires using the camera.\n\nPlease consider granting access.</string>
<string name="permission_camera_denied_toast">Camera permission was not granted</string> <string name="permission_camera_denied_toast">Camera permission was not granted</string>
<string name="open_settings">Open Settings</string>
</resources> </resources>