mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 03:52:15 +02:00
Code

lint: de-lint CardBrowser

Browse Source 
Obvious transforms suggested by AndroidStudio
This commit is contained in:
Mike Hardy 2021-05-22 10:58:34 -05:00
parent 2d0056c3f0
commit a862073a8f
No known key found for this signature in database
GPG Key ID: 2FB9315A0E38FF42
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.java
View File

@ -18,6 +18,7 @@
package com.ichi2.anki;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
@ -107,7 +108,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import timber.log.Timber;
@ -156,7 +156,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
/** List of cards in the browser.
* When the list is changed, the position member of its elements should get changed.*/
@NonNull
private CardCollection<CardCache> mCards = new CardCollection<>();
private final CardCollection<CardCache> mCards = new CardCollection<>();
public DeckSpinnerSelection mDeckSpinnerSelection;
@VisibleForTesting
public ListView mCardsListView;
@ -324,12 +324,12 @@ public class CardBrowser extends NavigationDrawerActivity implements
getCol().getConf().put("sortType", fSortTypes[1]);
AnkiDroidApp.getSharedPrefs(getBaseContext()).edit()
.putBoolean("cardBrowserNoSorting", true)
.commit();
.apply();
} else {
getCol().getConf().put("sortType", fSortTypes[mOrder]);
AnkiDroidApp.getSharedPrefs(getBaseContext()).edit()
.putBoolean("cardBrowserNoSorting", false)
.commit();
.apply();
}
getCol().getConf().put("sortBackwards", mOrderAsc);
searchCards();
@ -645,7 +645,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
if (pos != mColumn1Index) {
mColumn1Index = pos;
AnkiDroidApp.getSharedPrefs(AnkiDroidApp.getInstance().getBaseContext()).edit()
.putInt("cardBrowserColumn1", mColumn1Index).commit();
.putInt("cardBrowserColumn1", mColumn1Index).apply();
Column[] fromMap = mCardsAdapter.getFromMapping();
fromMap[0] = COLUMN1_KEYS[mColumn1Index];
mCardsAdapter.setFromMapping(fromMap);
@ -673,7 +673,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
if (pos != mColumn2Index) {
mColumn2Index = pos;
AnkiDroidApp.getSharedPrefs(AnkiDroidApp.getInstance().getBaseContext()).edit()
.putInt("cardBrowserColumn2", mColumn2Index).commit();
.putInt("cardBrowserColumn2", mColumn2Index).apply();
Column[] fromMap = mCardsAdapter.getFromMapping();
fromMap[1] = COLUMN2_KEYS[mColumn2Index];
mCardsAdapter.setFromMapping(fromMap);
@ -1442,7 +1442,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
}
@Override
public void onSaveInstanceState(Bundle savedInstanceState) {
public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
// Save current search terms
savedInstanceState.putString("mSearchTerms", mSearchTerms);
savedInstanceState.putLong("mOldCardId", mOldCardId);
@ -1455,7 +1455,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
}
@Override
public void onRestoreInstanceState(Bundle savedInstanceState) {
public void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
mSearchTerms = savedInstanceState.getString("mSearchTerms");
mOldCardId = savedInstanceState.getLong("mOldCardId");
@ -1695,9 +1695,6 @@ public class CardBrowser extends NavigationDrawerActivity implements
}
private ChangeDeckHandler changeDeckHandler() {
return new ChangeDeckHandler(this);
}
private static class ChangeDeckHandler extends ListenerWithProgressBarCloseOnFalse<Object, PairWithBoolean<Card[]>> {
public ChangeDeckHandler(CardBrowser browser) {
super("Card Browser - changeDeckHandler.actualOnPostExecute(CardBrowser browser)", browser);
@ -1758,6 +1755,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
/**
* Removes cards from view. Doesn't delete them in model (database).
*/
@SuppressWarnings("SameParameterValue")
private void removeNotesView(Card[] cards, boolean reorderCards) {
List<Long> cardIds = new ArrayList<>(cards.length);
for (Card c : cards) {
@ -1875,7 +1873,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
@Override
protected void actualOnValidPostExecute(CardBrowser browser, BooleanGetter result) {
browser.hideProgressBar();
browser.mActionBarTitle.setText(Integer.toString(browser.checkedCardCount()));
browser.mActionBarTitle.setText(String.format(Locale.ROOT, "%d", browser.checkedCardCount()));
browser.invalidateOptionsMenu(); // maybe the availability of undo changed
// snackbar to offer undo
String deletedMessage = browser.getResources().getQuantityString(R.plurals.card_browser_cards_deleted, mCardsDeleted, mCardsDeleted);
@ -2151,6 +2149,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
}
@SuppressWarnings("SameParameterValue")
private void closeCardBrowser(int result) {
closeCardBrowser(result, null);
}
@ -2400,7 +2399,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
}
updateMultiselectMenu();
mActionBarTitle.setText(Integer.toString(checkedCardCount()));
mActionBarTitle.setText(String.format(Locale.ROOT, "%d", checkedCardCount()));
} finally {
mCardsAdapter.notifyDataSetChanged();
}
@ -2886,6 +2885,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
}
@VisibleForTesting
@SuppressWarnings("SameParameterValue")
void filterByFlag(int flag) {
mCurrentFlag = flag;
filterByFlag();
@ -2898,6 +2898,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
}
@VisibleForTesting
@SuppressWarnings("SameParameterValue")
void searchCards(String searchQuery) {
mSearchTerms = searchQuery;
searchCards();