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

Remove static import of R's fields.

Browse Source
This commit is contained in:
akwizgran
2018-10-11 17:19:29 +01:00
parent de611857cf
commit efe15df940
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,6 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.bramble.api.plugin.event.BluetoothEnabledEvent; import org.briarproject.bramble.api.plugin.event.BluetoothEnabledEvent;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.R.string;
import org.briarproject.briar.R.style;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.BaseFragment;
@@ -217,14 +215,14 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
boolean cameraRationale = shouldShowRationale(CAMERA); boolean cameraRationale = shouldShowRationale(CAMERA);
boolean locationRationale = shouldShowRationale(ACCESS_COARSE_LOCATION); boolean locationRationale = shouldShowRationale(ACCESS_COARSE_LOCATION);
if (cameraRationale && locationRationale) { if (cameraRationale && locationRationale) {
showRationale(string.permission_camera_location_title, showRationale(R.string.permission_camera_location_title,
string.permission_camera_location_request_body); R.string.permission_camera_location_request_body);
} else if (cameraRationale) { } else if (cameraRationale) {
showRationale(string.permission_camera_title, showRationale(R.string.permission_camera_title,
string.permission_camera_request_body); R.string.permission_camera_request_body);
} else if (locationRationale) { } else if (locationRationale) {
showRationale(string.permission_location_title, showRationale(R.string.permission_location_title,
string.permission_location_request_body); R.string.permission_location_request_body);
} else if (gotCameraPermission) { } else if (gotCameraPermission) {
// Location permission has been permanently denied but we can // Location permission has been permanently denied but we can
// continue without it // continue without it
@@ -246,10 +244,10 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
} }
private void showRationale(@StringRes int title, @StringRes int body) { private void showRationale(@StringRes int title, @StringRes int body) {
Builder builder = new Builder(this, style.BriarDialogTheme); Builder builder = new Builder(this, R.style.BriarDialogTheme);
builder.setTitle(title); builder.setTitle(title);
builder.setMessage(body); builder.setMessage(body);
builder.setNeutralButton(string.continue_button, builder.setNeutralButton(R.string.continue_button,
(dialog, which) -> requestPermissions()); (dialog, which) -> requestPermissions());
builder.show(); builder.show();
} }
@@ -274,17 +272,19 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
showNextScreen(); showNextScreen();
} else { } else {
if (shouldShowRationale(CAMERA)) { if (shouldShowRationale(CAMERA)) {
Toast.makeText(this, string.permission_camera_denied_toast, Toast.makeText(this,
R.string.permission_camera_denied_toast,
LENGTH_LONG).show(); LENGTH_LONG).show();
supportFinishAfterTransition(); supportFinishAfterTransition();
} else { } else {
// The user has permanently denied the request // The user has permanently denied the request
Builder builder = new Builder(this, style.BriarDialogTheme); Builder builder =
builder.setTitle(string.permission_camera_title); new Builder(this, R.style.BriarDialogTheme);
builder.setMessage(string.permission_camera_denied_body); builder.setTitle(R.string.permission_camera_title);
builder.setPositiveButton(string.ok, builder.setMessage(R.string.permission_camera_denied_body);
builder.setPositiveButton(R.string.ok,
UiUtils.getGoToSettingsListener(this)); UiUtils.getGoToSettingsListener(this));
builder.setNegativeButton(string.cancel, builder.setNegativeButton(R.string.cancel,
(dialog, which) -> supportFinishAfterTransition()); (dialog, which) -> supportFinishAfterTransition());
builder.show(); builder.show();
} }