Skip to content

Commit

Permalink
PMD: Enforce variable naming
Browse files Browse the repository at this point in the history 
Inspired by a review for another change; these things are better found
by tooling.

Non-final fields with NAMING_INDICATING_FINALITY have been turned into
final fields when possible.

In Bank.java, refactored the API a bit so that bank names can be
constant.
  • Loading branch information
@goober
Johan Walles authored and goober committed Nov 4, 2016
1 parent e1cbce7 commit 0423092
Show file tree
Hide file tree
Showing 60 changed files with 757 additions and 551 deletions.
34 changes: 17 additions & 17 deletions app/src/main/java/com/liato/bankdroid/BankEditActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ public class BankEditActivity extends LockableActivity implements OnItemSelected
@InjectView(R.id.txtErrorDesc)
TextView mErrorDescription;

private Bank SELECTED_BANK;
private Bank selectedBank;

private long BANKID = -1;
private long bankId = -1;

@Override
public void onCreate(Bundle savedInstanceState) {
Expand All @@ -101,16 +101,16 @@ public void onCreate(Bundle savedInstanceState) {

Bundle extras = getIntent().getExtras();
if (extras != null) {
BANKID = extras.getLong("id", -1);
if (BANKID != -1) {
Bank bank = BankFactory.bankFromDb(BANKID, this, false);
bankId = extras.getLong("id", -1);
if (bankId != -1) {
Bank bank = BankFactory.bankFromDb(bankId, this, false);
if (bank != null) {
mErrorDescription.setVisibility(
bank.isDisabled() ? View.VISIBLE : View.INVISIBLE);
mBankSpinner.setEnabled(false);
mBankSpinner.setSelection(adapter.getPosition(bank));
SELECTED_BANK = bank;
createForm(SELECTED_BANK.getConnectionConfiguration(),
selectedBank = bank;
createForm(selectedBank.getConnectionConfiguration(),
DefaultConnectionConfiguration.fields()
);
populateForm(bank);
Expand All @@ -125,10 +125,10 @@ public void onSubmit(View v) {
if (!validate()) {
return;
}
SELECTED_BANK.setProperties(getFormParameters(SELECTED_BANK.getConnectionConfiguration()));
SELECTED_BANK.setCustomName(getFormParameter(DefaultConnectionConfiguration.NAME));
SELECTED_BANK.setDbid(BANKID);
new DataRetrieverTask(this, SELECTED_BANK).execute();
selectedBank.setProperties(getFormParameters(selectedBank.getConnectionConfiguration()));
selectedBank.setCustomName(getFormParameter(DefaultConnectionConfiguration.NAME));
selectedBank.setDbid(bankId);
new DataRetrieverTask(this, selectedBank).execute();
}

@OnClick(R.id.btnSettingsCancel)
Expand All @@ -139,10 +139,10 @@ public void onCancel(View v) {
@Override
public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int pos, long id) {
Bank selectedBank = (Bank) parentView.getItemAtPosition(pos);
if (SELECTED_BANK == null || !SELECTED_BANK.equals(selectedBank)) {
SELECTED_BANK = selectedBank;
if (this.selectedBank == null || !this.selectedBank.equals(selectedBank)) {
this.selectedBank = selectedBank;
mFormContainer.removeAllViewsInLayout();
createForm(SELECTED_BANK.getConnectionConfiguration(),
createForm(this.selectedBank.getConnectionConfiguration(),
DefaultConnectionConfiguration.fields()
);
}
Expand Down Expand Up @@ -233,7 +233,7 @@ private String getFormParameter(String property) {

private boolean validate() {
boolean valid = true;
Iterator<Field> fields = Iterators.concat(SELECTED_BANK.getConnectionConfiguration().iterator(),
Iterator<Field> fields = Iterators.concat(selectedBank.getConnectionConfiguration().iterator(),
DefaultConnectionConfiguration.fields().iterator());
while (fields.hasNext()) {
Field field = fields.next();
Expand Down Expand Up @@ -357,8 +357,8 @@ protected void onPostExecute(final Void unused) {
builder.setTitle(R.string.select_a_bank);
builder.setItems(items, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int item) {
SELECTED_BANK.setExtras(e.getBanks().get(item).getId());
new DataRetrieverTask(context, SELECTED_BANK).execute();
selectedBank.setExtras(e.getBanks().get(item).getId());
new DataRetrieverTask(context, selectedBank).execute();
}
});
} else {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/liato/bankdroid/LockableActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

public class LockableActivity extends ActionBarActivity {

private static int PATTERNLOCK_UNLOCK = 42;
private static final int PATTERNLOCK_UNLOCK = 42;

protected boolean mSkipLockOnce = false;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/liato/bankdroid/LockablePreferenceActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

public class LockablePreferenceActivity extends PreferenceActivity {

private static int PATTERNLOCK_UNLOCK = 42;
private static final int PATTERNLOCK_UNLOCK = 42;

private SharedPreferences mPrefs;

Expand Down
54 changes: 27 additions & 27 deletions app/src/main/java/com/liato/bankdroid/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public class MainActivity extends LockableActivity {

protected static boolean showHidden = false;

private static Bank selected_bank = null;
private static Bank selectedBank = null;

private static Account selected_account = null;
private static Account selectedAccount = null;

private final BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
Expand Down Expand Up @@ -91,14 +91,14 @@ public void onCreate(final Bundle savedInstanceState) {
public boolean onItemLongClick(final AdapterView<?> parent, final View view,
final int position, final long id) {
if (adapter.getItem(position) instanceof Account) {
selected_account = (Account) adapter.getItem(position);
selectedAccount = (Account) adapter.getItem(position);
final PopupMenuAccount pmenu = new PopupMenuAccount(parent, view, MainActivity.this);
pmenu.showLikeQuickAction(0, 12);
return true;
} else if (adapter.getItem(position) instanceof Bank) {
selected_bank = (Bank) adapter.getItem(position);
selected_bank.toggleHideAccounts();
DBAdapter.save(selected_bank, MainActivity.this);
selectedBank = (Bank) adapter.getItem(position);
selectedBank.toggleHideAccounts();
DBAdapter.save(selectedBank, MainActivity.this);
refreshView();
return true;
}
Expand All @@ -110,7 +110,7 @@ public boolean onItemLongClick(final AdapterView<?> parent, final View view,
public void onItemClick(final AdapterView<?> parent, final View view,
final int position, final long id) {
if (adapter.getItem(position) instanceof Bank) {
selected_bank = (Bank) adapter.getItem(position);
selectedBank = (Bank) adapter.getItem(position);
final PopupMenuBank pmenu = new PopupMenuBank(parent, view, MainActivity.this);
pmenu.showLikeQuickAction(0, 12);
} else {
Expand Down Expand Up @@ -241,7 +241,7 @@ protected void onCreate() {
final Button btnHide = (Button) root.findViewById(R.id.btnHide);
final Button btnUnhide = (Button) root.findViewById(R.id.btnUnhide);
final Button btnWWW = (Button) root.findViewById(R.id.btnWWW);
if (selected_bank.getHideAccounts()) {
if (selectedBank.getHideAccounts()) {
btnHide.setVisibility(View.GONE);
btnUnhide.setVisibility(View.VISIBLE);
btnUnhide.setOnClickListener(this);
Expand All @@ -250,7 +250,7 @@ protected void onCreate() {
btnUnhide.setVisibility(View.GONE);
btnHide.setOnClickListener(this);
}
if (selected_bank.isWebViewEnabled()) {
if (selectedBank.isWebViewEnabled()) {
btnWWW.setOnClickListener(this);
} else {
btnWWW.setVisibility(View.GONE);
Expand All @@ -270,29 +270,29 @@ public void onClick(final View v) {
case R.id.btnHide:
case R.id.btnUnhide:
this.dismiss();
selected_bank.toggleHideAccounts();
DBAdapter.save(selected_bank, context);
selectedBank.toggleHideAccounts();
DBAdapter.save(selectedBank, context);
parent.refreshView();
return;
case R.id.btnWWW:
if (selected_bank != null && selected_bank.isWebViewEnabled()) {
//Uri uri = Uri.parse(selected_bank.getURL());
if (selectedBank != null && selectedBank.isWebViewEnabled()) {
//Uri uri = Uri.parse(selectedBank.getURL());
//Intent intent = new Intent(Intent.ACTION_VIEW, uri);
final Intent intent = new Intent(context, WebViewActivity.class);
intent.putExtra("bankid", selected_bank.getDbId());
intent.putExtra("bankid", selectedBank.getDbId());
context.startActivity(intent);
}
this.dismiss();
return;
case R.id.btnEdit:
final Intent intent = new Intent(context, BankEditActivity.class);
intent.putExtra("id", selected_bank.getDbId());
intent.putExtra("id", selectedBank.getDbId());
context.startActivity(intent);
this.dismiss();
return;
case R.id.btnRefresh:
this.dismiss();
new DataRetrieverTask(parent, selected_bank.getDbId()).execute();
new DataRetrieverTask(parent, selectedBank.getDbId()).execute();
return;
case R.id.btnRemove:
this.dismiss();
Expand All @@ -307,7 +307,7 @@ public void onClick(final View v) {
public void onClick(final DialogInterface dialog,
final int id) {
final DBAdapter db = new DBAdapter(context);
db.deleteBank(selected_bank.getDbId());
db.deleteBank(selectedBank.getDbId());
dialog.cancel();
parent.refreshView();
}
Expand Down Expand Up @@ -358,7 +358,7 @@ protected void onCreate() {
.findViewById(R.id.btnDisableNotifications);
final Button btnEnableNotifications = (Button) root
.findViewById(R.id.btnEnableNotifications);
if (selected_account.isHidden()) {
if (selectedAccount.isHidden()) {
btnHide.setVisibility(View.GONE);
btnUnhide.setVisibility(View.VISIBLE);
btnUnhide.setOnClickListener(this);
Expand All @@ -367,7 +367,7 @@ protected void onCreate() {
btnUnhide.setVisibility(View.GONE);
btnHide.setOnClickListener(this);
}
if (selected_account.isNotify()) {
if (selectedAccount.isNotify()) {
btnDisableNotifications.setVisibility(View.VISIBLE);
btnDisableNotifications.setOnClickListener(this);
btnEnableNotifications.setVisibility(View.GONE);
Expand All @@ -385,26 +385,26 @@ public void onClick(final View v) {
switch (id) {
case R.id.btnHide:
this.dismiss();
selected_account.setHidden(true);
DBAdapter.save(selected_account.getBank(), parent);
selectedAccount.setHidden(true);
DBAdapter.save(selectedAccount.getBank(), parent);
parent.refreshView();
return;
case R.id.btnUnhide:
this.dismiss();
selected_account.setHidden(false);
DBAdapter.save(selected_account.getBank(), parent);
selectedAccount.setHidden(false);
DBAdapter.save(selectedAccount.getBank(), parent);
parent.refreshView();
return;
case R.id.btnEnableNotifications:
this.dismiss();
selected_account.setNotify(true);
DBAdapter.save(selected_account.getBank(), parent);
selectedAccount.setNotify(true);
DBAdapter.save(selectedAccount.getBank(), parent);
parent.refreshView();
return;
case R.id.btnDisableNotifications:
this.dismiss();
selected_account.setNotify(false);
DBAdapter.save(selected_account.getBank(), parent);
selectedAccount.setNotify(false);
DBAdapter.save(selectedAccount.getBank(), parent);
parent.refreshView();
return;

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/liato/bankdroid/appwidget/AutoRefreshService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,15 @@ protected Void doInBackground(final String... args) {
}
} catch (final BankException e) {
// Refresh widgets if an update fails
Timber.e(e, "Could not update bank %s", bank.getShortName());
Timber.e(e, "Could not update bank %s", bank.getName());
} catch (final LoginException e) {
Timber.d(e, "Invalid credentials for bank %s", bank.getShortName());
Timber.d(e, "Invalid credentials for bank %s", bank.getName());
refreshWidgets = true;
db.disableBank(bank.getDbId());
} catch (BankChoiceException e) {
Timber.w(e, "BankChoiceException");
} catch (Exception e) {
Timber.e(e, "An unexpected error occurred while updating bank %s", bank.getShortName());
Timber.e(e, "An unexpected error occurred while updating bank %s", bank.getName());
}
}

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/liato/bankdroid/appwidget/BankdroidWidgetProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,15 +390,15 @@ protected Void doInBackground(Void... params) {
}

} catch (BankException e) {
Timber.e(e, "Could not update bank %s", bank.getShortName());
Timber.e(e, "Could not update bank %s", bank.getName());
} catch (LoginException e) {
Timber.w(e, "Invalid credentials for bank %s", bank.getShortName());
Timber.w(e, "Invalid credentials for bank %s", bank.getName());
DBAdapter.disable(bank, context);
} catch (BankChoiceException e) {
Timber.w(e, "BankChoiceException");
} catch (IOException e) {
if (NetworkUtils.isInternetAvailable()) {
Timber.e(e, "Could not update bank %s", bank.getShortName());
Timber.e(e, "Could not update bank %s", bank.getName());
}
}
BankdroidWidgetProvider.updateAppWidget(context, appWidgetManager, appWidgetId);
Expand Down
50 changes: 25 additions & 25 deletions app/src/main/java/com/liato/bankdroid/provider/BankTransactionsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,44 +67,44 @@ public class BankTransactionsProvider extends ContentProvider implements

private static final String TRANSACTIONS_TABLE = "transactions";

private final static UriMatcher uriMatcher;
private final static UriMatcher URI_MATCHER;

private final static Map<String, String> bankAccountProjectionMap;
private final static Map<String, String> BANK_ACCOUNT_PROJECTION_MAP;

private final static Map<String, String> transProjectionMap;
private final static Map<String, String> TRANS_PROJECTION_MAP;

static {
uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
uriMatcher.addURI(AUTHORITY, TRANSACTIONS_CAT + "/" + WILD_CARD,
URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
URI_MATCHER.addURI(AUTHORITY, TRANSACTIONS_CAT + "/" + WILD_CARD,
TRANSACTIONS);
uriMatcher.addURI(AUTHORITY, BANK_ACCOUNTS_CAT + "/" + WILD_CARD,
URI_MATCHER.addURI(AUTHORITY, BANK_ACCOUNTS_CAT + "/" + WILD_CARD,
BANK_ACCOUNTS);

// Projections are "Poor mans views" of the data.
bankAccountProjectionMap = new HashMap<String, String>();
BANK_ACCOUNT_PROJECTION_MAP = new HashMap<String, String>();

// Must match bankAccountProjection in
// IBankTransactionsProvider#bankAccountProjection
bankAccountProjectionMap.put(BANK_ID, BANK_ID);
bankAccountProjectionMap.put(BANK_NAME, BANK_NAME);
bankAccountProjectionMap.put(BANK_TYPE, BANK_TYPE);
bankAccountProjectionMap.put(BANK_LAST_UPDATED, BANK_LAST_UPDATED);
bankAccountProjectionMap.put(ACC_ID, ACC_ID);
bankAccountProjectionMap.put(ACC_NAME, ACC_NAME);
BANK_ACCOUNT_PROJECTION_MAP.put(BANK_ID, BANK_ID);
BANK_ACCOUNT_PROJECTION_MAP.put(BANK_NAME, BANK_NAME);
BANK_ACCOUNT_PROJECTION_MAP.put(BANK_TYPE, BANK_TYPE);
BANK_ACCOUNT_PROJECTION_MAP.put(BANK_LAST_UPDATED, BANK_LAST_UPDATED);
BANK_ACCOUNT_PROJECTION_MAP.put(ACC_ID, ACC_ID);
BANK_ACCOUNT_PROJECTION_MAP.put(ACC_NAME, ACC_NAME);
// Table name has to be explicitly included here since Banks also have a column named balance.
bankAccountProjectionMap.put(ACC_BALANCE, ACCOUNT_TABLE + "." + ACC_BALANCE);
bankAccountProjectionMap.put(ACC_TYPE, ACC_TYPE);
BANK_ACCOUNT_PROJECTION_MAP.put(ACC_BALANCE, ACCOUNT_TABLE + "." + ACC_BALANCE);
BANK_ACCOUNT_PROJECTION_MAP.put(ACC_TYPE, ACC_TYPE);

transProjectionMap = new HashMap<String, String>();
TRANS_PROJECTION_MAP = new HashMap<String, String>();

// Must match transactionProjection in
// IBankTransactionsProvider#transactionProjection
transProjectionMap.put(TRANS_ID, TRANS_ID);
transProjectionMap.put(TRANS_DATE, TRANS_DATE);
transProjectionMap.put(TRANS_DESC, TRANS_DESC);
transProjectionMap.put(TRANS_AMT, TRANS_AMT);
transProjectionMap.put(TRANS_CUR, TRANS_CUR);
transProjectionMap.put(TRANS_ACCNT, TRANS_ACCNT);
TRANS_PROJECTION_MAP.put(TRANS_ID, TRANS_ID);
TRANS_PROJECTION_MAP.put(TRANS_DATE, TRANS_DATE);
TRANS_PROJECTION_MAP.put(TRANS_DESC, TRANS_DESC);
TRANS_PROJECTION_MAP.put(TRANS_AMT, TRANS_AMT);
TRANS_PROJECTION_MAP.put(TRANS_CUR, TRANS_CUR);
TRANS_PROJECTION_MAP.put(TRANS_ACCNT, TRANS_ACCNT);
}

private DatabaseHelper dbHelper;
Expand Down Expand Up @@ -143,7 +143,7 @@ public int delete(final Uri uri, final String selection,
public String getType(final Uri uri) {
Timber.d("Got URI: %s", uri.toString());

switch (uriMatcher.match(uri)) {
switch (URI_MATCHER.match(uri)) {
case BANK_ACCOUNTS:
return BANK_ACCOUNTS_MIME;
case TRANSACTIONS:
Expand Down Expand Up @@ -207,12 +207,12 @@ public Cursor query(final Uri uri, final String[] projection,
if (BANK_ACCOUNTS_MIME.equals(getType(uri))) {
qb = new SQLiteQueryBuilder();
qb.setTables(BANK_ACCOUNT_TABLES);
qb.setProjectionMap(bankAccountProjectionMap);
qb.setProjectionMap(BANK_ACCOUNT_PROJECTION_MAP);
qb.setDistinct(true);
} else if (TRANSACTIONS_MIME.equals(getType(uri))) {
qb = new SQLiteQueryBuilder();
qb.setTables(TRANSACTIONS_TABLE);
qb.setProjectionMap(transProjectionMap);
qb.setProjectionMap(TRANS_PROJECTION_MAP);
} else {
throw new IllegalArgumentException("Unsupported URI: " + uri);
}
Expand Down
Loading

0 comments on commit 0423092

Please sign in to comment.