mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-02-01 02:31:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make spotBugs happy

Browse Source
This commit is contained in:
Sylvia van Os
2021-11-17 19:13:28 +01:00
parent fc902db170
commit 2f8d8e79c1
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
View File

@@ -18,7 +18,6 @@ import java.util.ArrayList;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import protect.card_locker.async.TaskHandler;
/**
* This activity is callable and will allow a user to enter
@@ -33,12 +32,9 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
public static final String BARCODE_CONTENTS = "contents";
public static final String BARCODE_FORMAT = "format";
final private TaskHandler mTasks = new TaskHandler();
private final Handler typingDelayHandler = new Handler(Looper.getMainLooper());
public static final Integer INPUT_DELAY = 250;
private ListView mBarcodeList;
private BarcodeSelectorAdapter mAdapter;
@Override
@@ -54,7 +50,9 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
}
EditText cardId = findViewById(R.id.cardId);
mBarcodeList = findViewById(R.id.barcodes);
ListView mBarcodeList = findViewById(R.id.barcodes);
mAdapter = new BarcodeSelectorAdapter(this, new ArrayList<>(), this);
mBarcodeList.setAdapter(mAdapter);
cardId.addTextChangedListener(new SimpleTextWatcher() {
@Override
@@ -87,18 +85,13 @@ public class BarcodeSelectorActivity extends CatimaAppCompatActivity implements
}
private void generateBarcodes(String value) {
// Attempt to stop any async tasks which may not have been started yet
// TODO this can be very much optimized by only generating Barcodes visible to the User
mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
// Update barcodes
ArrayList<CatimaBarcodeWithValue> catimaBarcodeWithValues = new ArrayList<>();
mAdapter = new BarcodeSelectorAdapter(this, catimaBarcodeWithValues, mTasks, this);
ArrayList<CatimaBarcodeWithValue> barcodes = new ArrayList<>();
for (BarcodeFormat barcodeFormat : CatimaBarcode.barcodeFormats) {
CatimaBarcode catimaBarcode = CatimaBarcode.fromBarcode(barcodeFormat);
mAdapter.add(new CatimaBarcodeWithValue(catimaBarcode, value));
barcodes.add(new CatimaBarcodeWithValue(catimaBarcode, value));
}
mBarcodeList.setAdapter(mAdapter);
mAdapter.setBarcodes(barcodes);
}
private void setButtonListener(final View button, final String cardId) {

12
app/src/main/java/protect/card_locker/BarcodeSelectorAdapter.java
View File

@@ -17,7 +17,7 @@ import protect.card_locker.async.TaskHandler;
public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue> {
private static final String TAG = "Catima";
private final TaskHandler mTasks;
private final TaskHandler mTasks = new TaskHandler();
private final BarcodeSelectorListener mListener;
private static class ViewHolder {
@@ -29,12 +29,18 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
void onRowClicked(int inputPosition, View view);
}
public BarcodeSelectorAdapter(Context context, ArrayList<CatimaBarcodeWithValue> barcodes, TaskHandler taskHandler, BarcodeSelectorListener barcodeSelectorListener) {
public BarcodeSelectorAdapter(Context context, ArrayList<CatimaBarcodeWithValue> barcodes, BarcodeSelectorListener barcodeSelectorListener) {
super(context, 0, barcodes);
mTasks = taskHandler;
mListener = barcodeSelectorListener;
}
public void setBarcodes(ArrayList<CatimaBarcodeWithValue> barcodes) {
clear();
addAll(barcodes);
notifyDataSetChanged();
mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
}
@Override
public View getView(int position, View convertView, ViewGroup parent) {
CatimaBarcodeWithValue catimaBarcodeWithValue = getItem(position);