From 085bb7a94c2c459f356bc95bb20eca255128b092 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 29 Jul 2021 18:13:12 +0200 Subject: Make use of Java 10 var keyword Signed-off-by: Stefan Niedermann --- .../notes/manageaccounts/ManageAccountAdapter.java | 2 +- .../manageaccounts/ManageAccountViewHolder.java | 6 ++-- .../manageaccounts/ManageAccountsActivity.java | 42 +++++++++++----------- .../manageaccounts/ManageAccountsViewModel.java | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'app/src/main/java/it/niedermann/owncloud/notes/manageaccounts') diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java index 25155c9a..19adee12 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java @@ -53,7 +53,7 @@ public class ManageAccountAdapter extends RecyclerView.Adapter { setCurrentLocalAccount(localAccountClicked); onAccountClick.accept(localAccountClicked); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java index 2c29ce99..3b61851a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountViewHolder.java @@ -53,11 +53,11 @@ public class ManageAccountViewHolder extends RecyclerView.ViewHolder { itemView.setOnClickListener((v) -> onAccountClick.accept(localAccount)); binding.accountContextMenu.setVisibility(VISIBLE); binding.accountContextMenu.setOnClickListener((v) -> { - final PopupMenu popup = new PopupMenu(itemView.getContext(), v); + final var popup = new PopupMenu(itemView.getContext(), v); popup.inflate(R.menu.menu_account); - final ApiVersion preferredApiVersion = getPreferredApiVersion(localAccount.getApiVersion()); + final var preferredApiVersion = getPreferredApiVersion(localAccount.getApiVersion()); if (preferredApiVersion != null && !preferredApiVersion.supportsSettings()) { - final Menu menu = popup.getMenu(); + final var menu = popup.getMenu(); Stream.of( R.id.notes_path, R.id.file_suffix diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java index d1b0e603..b6341f61 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java @@ -114,21 +114,21 @@ public class ManageAccountsActivity extends LockedActivity { } private void onChangeNotesPath(@NonNull Account localAccount) { - final NotesRepository repository = NotesRepository.getInstance(getApplicationContext()); - final EditText editText = new EditText(this); - final ViewGroup wrapper = createDialogViewWrapper(); - final AlertDialog dialog = new BrandedAlertDialogBuilder(this) + final var repository = NotesRepository.getInstance(getApplicationContext()); + final var editText = new EditText(this); + final var wrapper = createDialogViewWrapper(); + final var dialog = new BrandedAlertDialogBuilder(this) .setTitle(R.string.settings_notes_path) .setMessage(R.string.settings_notes_path_description) .setView(wrapper) .setNeutralButton(android.R.string.cancel, null) .setPositiveButton(R.string.action_edit_save, (v, d) -> new Thread(() -> { try { - final Call putSettingsCall = repository.putServerSettings(AccountImporter.getSingleSignOnAccount(this, localAccount.getAccountName()), new NotesSettings(editText.getText().toString(), null), getPreferredApiVersion(localAccount.getApiVersion())); - putSettingsCall.enqueue(new Callback() { + final var putSettingsCall = repository.putServerSettings(AccountImporter.getSingleSignOnAccount(this, localAccount.getAccountName()), new NotesSettings(editText.getText().toString(), null), getPreferredApiVersion(localAccount.getApiVersion())); + putSettingsCall.enqueue(new Callback<>() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { - final NotesSettings body = response.body(); + final var body = response.body(); if (response.isSuccessful() && body != null) { runOnUiThread(() -> Toast.makeText(ManageAccountsActivity.this, getString(R.string.settings_notes_path_success, body.getNotesPath()), Toast.LENGTH_LONG).show()); } else { @@ -148,14 +148,14 @@ public class ManageAccountsActivity extends LockedActivity { .show(); try { repository.getServerSettings(AccountImporter.getSingleSignOnAccount(this, localAccount.getAccountName()), getPreferredApiVersion(localAccount.getApiVersion())) - .enqueue(new Callback() { + .enqueue(new Callback<>() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { runOnUiThread(() -> { - final NotesSettings body = response.body(); + final var body = response.body(); if (response.isSuccessful() && body != null) { wrapper.removeAllViews(); - final EditText editText = new EditText(ManageAccountsActivity.this); + final var editText = new EditText(ManageAccountsActivity.this); editText.setText(body.getNotesPath()); wrapper.addView(editText); } else { @@ -180,13 +180,13 @@ public class ManageAccountsActivity extends LockedActivity { } private void onChangeFileSuffix(@NonNull Account localAccount) { - final NotesRepository repository = NotesRepository.getInstance(getApplicationContext()); - final Spinner spinner = new Spinner(this); - final ViewGroup wrapper = createDialogViewWrapper(); - final ArrayAdapter adapter = ArrayAdapter.createFromResource(this, R.array.settings_file_suffixes, android.R.layout.simple_spinner_item); + final var repository = NotesRepository.getInstance(getApplicationContext()); + final var spinner = new Spinner(this); + final var wrapper = createDialogViewWrapper(); + final var adapter = ArrayAdapter.createFromResource(this, R.array.settings_file_suffixes, android.R.layout.simple_spinner_item); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); spinner.setAdapter(adapter); - final AlertDialog dialog = new BrandedAlertDialogBuilder(this) + final var dialog = new BrandedAlertDialogBuilder(this) .setTitle(R.string.settings_file_suffix) .setMessage(R.string.settings_file_suffix_description) .setView(wrapper) @@ -194,10 +194,10 @@ public class ManageAccountsActivity extends LockedActivity { .setPositiveButton(R.string.action_edit_save, (v, d) -> new Thread(() -> { try { final Call putSettingsCall = repository.putServerSettings(AccountImporter.getSingleSignOnAccount(this, localAccount.getAccountName()), new NotesSettings(null, spinner.getSelectedItem().toString()), getPreferredApiVersion(localAccount.getApiVersion())); - putSettingsCall.enqueue(new Callback() { + putSettingsCall.enqueue(new Callback<>() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { - final NotesSettings body = response.body(); + final var body = response.body(); if (response.isSuccessful() && body != null) { runOnUiThread(() -> Toast.makeText(ManageAccountsActivity.this, getString(R.string.settings_file_suffix_success, body.getNotesPath()), Toast.LENGTH_LONG).show()); } else { @@ -217,7 +217,7 @@ public class ManageAccountsActivity extends LockedActivity { .show(); try { repository.getServerSettings(AccountImporter.getSingleSignOnAccount(this, localAccount.getAccountName()), getPreferredApiVersion(localAccount.getApiVersion())) - .enqueue(new Callback() { + .enqueue(new Callback<>() { @Override public void onResponse(@NonNull Call call, @NonNull Response response) { final NotesSettings body = response.body(); @@ -254,9 +254,9 @@ public class ManageAccountsActivity extends LockedActivity { @NonNull private ViewGroup createDialogViewWrapper() { - final ProgressBar progressBar = new ProgressBar(this, null, android.R.attr.progressBarStyleHorizontal); + final var progressBar = new ProgressBar(this, null, android.R.attr.progressBarStyleHorizontal); progressBar.setIndeterminate(true); - final FrameLayout wrapper = new FrameLayout(this); + final var wrapper = new FrameLayout(this); final int paddingVertical = getResources().getDimensionPixelSize(R.dimen.spacer_1x); final int paddingHorizontal = SDK_INT >= LOLLIPOP_MR1 ? getDimensionFromAttribute(android.R.attr.dialogPreferredPadding) @@ -268,7 +268,7 @@ public class ManageAccountsActivity extends LockedActivity { @Px private int getDimensionFromAttribute(@SuppressWarnings("SameParameterValue") @AttrRes int attr) { - final TypedValue typedValue = new TypedValue(); + final var typedValue = new TypedValue(); if (getTheme().resolveAttribute(attr, typedValue, true)) return TypedValue.complexToDimensionPixelSize(typedValue.data, getResources().getDisplayMetrics()); else { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsViewModel.java index ce88f2c2..b625b076 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsViewModel.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsViewModel.java @@ -48,7 +48,7 @@ public class ManageAccountsViewModel extends AndroidViewModel { public void deleteAccount(@NonNull Account account, @NonNull Context context) { executor.submit(() -> { - final List accounts = repo.getAccounts(); + final var accounts = repo.getAccounts(); for (int i = 0; i < accounts.size(); i++) { if (accounts.get(i).getId() == account.getId()) { if (i > 0) { -- cgit v1.2.3