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

Fix the lint problems I created for myself.

Browse Source
This commit is contained in:
akwizgran
2022-04-18 15:57:18 +01:00
parent 23316f5e9c
commit 383056d37e
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
View File

@@ -32,7 +32,6 @@ import javax.inject.Inject;
import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.ActivityResultLauncher;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AlertDialog.Builder; import androidx.appcompat.app.AlertDialog.Builder;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@@ -64,7 +63,6 @@ public class ImageActivity extends BriarActivity
final static String DATE = "date"; final static String DATE = "date";
final static String ITEM_ID = "itemId"; final static String ITEM_ID = "itemId";
@RequiresApi(api = 16)
private final static int UI_FLAGS_DEFAULT = private final static int UI_FLAGS_DEFAULT =
SYSTEM_UI_FLAG_LAYOUT_STABLE | SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; SYSTEM_UI_FLAG_LAYOUT_STABLE | SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
@@ -78,9 +76,11 @@ public class ImageActivity extends BriarActivity
private List<AttachmentItem> attachments; private List<AttachmentItem> attachments;
private MessageId conversationMessageId; private MessageId conversationMessageId;
private final ActivityResultLauncher<String> launcher = @Nullable
private final ActivityResultLauncher<String> launcher = SDK_INT >= 19 ?
registerForActivityResult(new CreateDocumentAdvanced(), registerForActivityResult(new CreateDocumentAdvanced(),
this::onImageUriSelected); this::onImageUriSelected) :
null;
@Override @Override
public void injectActivity(ActivityComponent component) { public void injectActivity(ActivityComponent component) {
@@ -208,14 +208,12 @@ public class ImageActivity extends BriarActivity
super.onBackPressed(); super.onBackPressed();
} }
@RequiresApi(api = 16)
private void onImageClicked(@Nullable Boolean clicked) { private void onImageClicked(@Nullable Boolean clicked) {
if (clicked != null && clicked) { if (clicked != null && clicked) {
toggleSystemUi(); toggleSystemUi();
} }
} }
@RequiresApi(api = 16)
private void toggleSystemUi() { private void toggleSystemUi() {
View decorView = getWindow().getDecorView(); View decorView = getWindow().getDecorView();
if (appBarLayout.getVisibility() == VISIBLE) { if (appBarLayout.getVisibility() == VISIBLE) {
@@ -225,7 +223,6 @@ public class ImageActivity extends BriarActivity
} }
} }
@RequiresApi(api = 16)
private void hideSystemUi(View decorView) { private void hideSystemUi(View decorView) {
decorView.setSystemUiVisibility( decorView.setSystemUiVisibility(
SYSTEM_UI_FLAG_FULLSCREEN | UI_FLAGS_DEFAULT); SYSTEM_UI_FLAG_FULLSCREEN | UI_FLAGS_DEFAULT);
@@ -236,7 +233,6 @@ public class ImageActivity extends BriarActivity
.start(); .start();
} }
@RequiresApi(api = 16)
private void showSystemUi(View decorView) { private void showSystemUi(View decorView) {
decorView.setSystemUiVisibility(UI_FLAGS_DEFAULT); decorView.setSystemUiVisibility(UI_FLAGS_DEFAULT);
appBarLayout.animate() appBarLayout.animate()
@@ -263,7 +259,7 @@ public class ImageActivity extends BriarActivity
if (SDK_INT >= 19) { if (SDK_INT >= 19) {
String name = viewModel.getFileName() + "." + String name = viewModel.getFileName() + "." +
getVisibleAttachment().getExtension(); getVisibleAttachment().getExtension();
launcher.launch(name); requireNonNull(launcher).launch(name);
} else { } else {
viewModel.saveImage(getVisibleAttachment()); viewModel.saveImage(getVisibleAttachment());
} }

14
briar-android/src/main/java/org/briarproject/briar/android/hotspot/FallbackFragment.java
View File

@@ -34,6 +34,7 @@ import static android.os.Build.VERSION.SDK_INT;
import static android.view.View.INVISIBLE; import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE; import static android.view.View.VISIBLE;
import static androidx.transition.TransitionManager.beginDelayedTransition; import static androidx.transition.TransitionManager.beginDelayedTransition;
import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
import static org.briarproject.briar.android.AppModule.getAndroidComponent; import static org.briarproject.briar.android.AppModule.getAndroidComponent;
import static org.briarproject.briar.android.hotspot.HotspotViewModel.getApkFileName; import static org.briarproject.briar.android.hotspot.HotspotViewModel.getApkFileName;
@@ -47,9 +48,11 @@ public class FallbackFragment extends BaseFragment {
ViewModelProvider.Factory viewModelFactory; ViewModelProvider.Factory viewModelFactory;
private HotspotViewModel viewModel; private HotspotViewModel viewModel;
private final ActivityResultLauncher<String> launcher = @Nullable
private final ActivityResultLauncher<String> launcher = SDK_INT >= 19 ?
registerForActivityResult(new CreateDocumentAdvanced(), registerForActivityResult(new CreateDocumentAdvanced(),
this::onDocumentCreated); this::onDocumentCreated) :
null;
private Button fallbackButton; private Button fallbackButton;
private ProgressBar progressBar; private ProgressBar progressBar;
@@ -87,8 +90,11 @@ public class FallbackFragment extends BaseFragment {
fallbackButton.setVisibility(INVISIBLE); fallbackButton.setVisibility(INVISIBLE);
progressBar.setVisibility(VISIBLE); progressBar.setVisibility(VISIBLE);
if (SDK_INT >= 19) launcher.launch(getApkFileName()); if (SDK_INT >= 19) {
else viewModel.exportApk(); requireNonNull(launcher).launch(getApkFileName());
} else {
viewModel.exportApk();
}
}); });
viewModel.getSavedApkToUri().observeEvent(this, this::shareUri); viewModel.getSavedApkToUri().observeEvent(this, this::shareUri);
} }