Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-deck.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Niedermann <info@niedermann.it>2021-08-03 12:45:33 +0300
committerStefan Niedermann <info@niedermann.it>2021-08-03 12:45:33 +0300
commit525173558538c9673ffa8fbbcb7d5ef17166449b (patch)
treeff11e79dc992f58f205d5d890e2651c3191835d3 /app/src/main/java/it/niedermann/nextcloud/deck/ui/exception
parenta9f814216069af7d960c22c036bfa1d92f69f2f3 (diff)
Make use of var keyword for complex class instances
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/exception')
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java4
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java12
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java13
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java6
4 files changed, 17 insertions, 18 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
index ac6335b90..31a20bb33 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java
@@ -23,7 +23,7 @@ public class ExceptionActivity extends AppCompatActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- final ActivityExceptionBinding binding = ActivityExceptionBinding.inflate(getLayoutInflater());
+ final var binding = ActivityExceptionBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
setSupportActionBar(binding.toolbar);
@@ -34,7 +34,7 @@ public class ExceptionActivity extends AppCompatActivity {
throwable = new Exception("Could not get exception");
}
- final TipsAdapter adapter = new TipsAdapter(this::startActivity);
+ final var adapter = new TipsAdapter(this::startActivity);
final String debugInfo = "Full Crash:\n\n" + ExceptionUtil.INSTANCE.getDebugInfos(this, throwable, BuildConfig.FLAVOR);
binding.tips.setAdapter(adapter);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
index 7a84ce0b6..987394b4b 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java
@@ -34,7 +34,7 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
@Override
public void onAttach(@NonNull Context context) {
super.onAttach(context);
- final Bundle args = getArguments();
+ final var args = getArguments();
if (args != null) {
this.throwable = (Throwable) args.getSerializable(KEY_THROWABLE);
if (this.throwable == null) {
@@ -47,10 +47,10 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
- final View view = View.inflate(getContext(), R.layout.dialog_exception, null);
- final DialogExceptionBinding binding = DialogExceptionBinding.bind(view);
+ final var view = View.inflate(getContext(), R.layout.dialog_exception, null);
+ final var binding = DialogExceptionBinding.bind(view);
- final TipsAdapter adapter = new TipsAdapter((actionIntent) -> requireActivity().startActivity(actionIntent));
+ final var adapter = new TipsAdapter((actionIntent) -> requireActivity().startActivity(actionIntent));
final String debugInfos = ExceptionUtil.INSTANCE.getDebugInfos(requireContext(), throwable, BuildConfig.FLAVOR, account == null ? null : account.getServerDeckVersion());
@@ -73,10 +73,10 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment {
}
public static DialogFragment newInstance(Throwable throwable, @Nullable Account account) {
- final Bundle args = new Bundle();
+ final var fragment = new ExceptionDialogFragment();
+ final var args = new Bundle();
args.putSerializable(KEY_THROWABLE, throwable);
args.putSerializable(KEY_ACCOUNT, account);
- final DialogFragment fragment = new ExceptionDialogFragment();
fragment.setArguments(args);
return fragment;
}
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java
index 04ed59c46..6d0c3ff5e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsAdapter.java
@@ -1,5 +1,8 @@
package it.niedermann.nextcloud.deck.ui.exception.tips;
+import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
+import static it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment.INTENT_EXTRA_BUTTON_TEXT;
+
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -8,7 +11,6 @@ import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.provider.Settings;
import android.view.LayoutInflater;
-import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
@@ -38,9 +40,6 @@ import it.niedermann.nextcloud.deck.exceptions.OfflineException;
import it.niedermann.nextcloud.deck.exceptions.UploadAttachmentFailedException;
import it.niedermann.nextcloud.deck.model.Account;
-import static android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
-import static it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment.INTENT_EXTRA_BUTTON_TEXT;
-
public class TipsAdapter extends RecyclerView.Adapter<TipsViewHolder> {
private static final String[] APPS = new String[]{Constants.PACKAGE_NAME_PROD, Constants.PACKAGE_NAME_DEV};
@@ -60,8 +59,8 @@ public class TipsAdapter extends RecyclerView.Adapter<TipsViewHolder> {
@NonNull
@Override
public TipsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- final View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_tip, parent, false);
- return new TipsViewHolder(v);
+ final var view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_tip, parent, false);
+ return new TipsViewHolder(view);
}
@Override
@@ -191,7 +190,7 @@ public class TipsAdapter extends RecyclerView.Adapter<TipsViewHolder> {
@Nullable
private static Intent getOpenFilesIntent(@NonNull Context context) {
- final PackageManager pm = context.getPackageManager();
+ final var pm = context.getPackageManager();
for (String app : APPS) {
try {
pm.getPackageInfo(app, PackageManager.GET_ACTIVITIES);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java
index 7d254459e..8a66c8cbf 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/tips/TipsViewHolder.java
@@ -1,5 +1,7 @@
package it.niedermann.nextcloud.deck.ui.exception.tips;
+import static it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment.INTENT_EXTRA_BUTTON_TEXT;
+
import android.content.Intent;
import android.view.View;
@@ -9,8 +11,6 @@ import androidx.recyclerview.widget.RecyclerView;
import it.niedermann.nextcloud.deck.databinding.ItemTipBinding;
-import static it.niedermann.nextcloud.deck.ui.exception.ExceptionDialogFragment.INTENT_EXTRA_BUTTON_TEXT;
-
public class TipsViewHolder extends RecyclerView.ViewHolder {
private final ItemTipBinding binding;
@@ -22,7 +22,7 @@ public class TipsViewHolder extends RecyclerView.ViewHolder {
public void bind(@NonNull TipsModel tip, @NonNull Consumer<Intent> actionButtonClickedListener) {
binding.tip.setText(tip.getText());
- final Intent actionIntent = tip.getActionIntent();
+ final var actionIntent = tip.getActionIntent();
if (actionIntent != null && actionIntent.hasExtra(INTENT_EXTRA_BUTTON_TEXT)) {
binding.actionButton.setVisibility(View.VISIBLE);
binding.actionButton.setText(actionIntent.getIntExtra(INTENT_EXTRA_BUTTON_TEXT, 0));