diff --git a/app/src/main/java/com/money/manager/ex/MmexApplication.java b/app/src/main/java/com/money/manager/ex/MmexApplication.java index 3420339d89..fd0dbd5b5f 100644 --- a/app/src/main/java/com/money/manager/ex/MmexApplication.java +++ b/app/src/main/java/com/money/manager/ex/MmexApplication.java @@ -134,7 +134,6 @@ public void onCreate() { if (BuildConfig.DEBUG) { Timber.plant(new DebugTree()); } else { - //Timber.plant(new CrashReportingTree()); Timber.plant(new ScreenTree()); Timber.plant(new SysLogTree()); } diff --git a/app/src/main/java/com/money/manager/ex/log/CrashReportingTree.java b/app/src/main/java/com/money/manager/ex/log/CrashReportingTree.java deleted file mode 100644 index b4e08718d7..0000000000 --- a/app/src/main/java/com/money/manager/ex/log/CrashReportingTree.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2012-2018 The Android Money Manager Ex Project Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 3 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.money.manager.ex.log; - -import android.util.Log; - -//import com.crashlytics.android.Crashlytics; - -import org.greenrobot.eventbus.EventBus; - -import timber.log.Timber; - -/** - * Logging tree for Production builds. Reports errors to Crashlytics. - * https://github.com/JakeWharton/timber/blob/master/timber-sample/src/main/java/com/example/timber/ExampleApp.java - */ -@Deprecated -public class CrashReportingTree extends Timber.Tree { - @Override - protected void log(int priority, String tag, String message, Throwable t) { - if (priority == Log.VERBOSE || priority == Log.DEBUG) { - return; - } - -// Crashlytics.log(priority, tag, message); - - if (t != null) { - if (priority == Log.ERROR) { -// Crashlytics.logException(t); - } -// else if (priority == Log.WARN) { -// Crashlytics.log.logWarning(t); -// } - } - - // also, raise an event for the UI to show the message. - String uiMessage = message; - if (t != null) { - uiMessage = "Error: " + t.getMessage(); - } - EventBus.getDefault().post(new ErrorRaisedEvent(uiMessage)); - } -} diff --git a/app/src/main/java/com/money/manager/ex/notifications/SmsReceiverTransactions.java b/app/src/main/java/com/money/manager/ex/notifications/SmsReceiverTransactions.java index 89f761257c..caebc849ec 100644 --- a/app/src/main/java/com/money/manager/ex/notifications/SmsReceiverTransactions.java +++ b/app/src/main/java/com/money/manager/ex/notifications/SmsReceiverTransactions.java @@ -35,7 +35,6 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; -import android.database.sqlite.SQLiteDatabase; import android.os.Build; import android.os.Bundle; import androidx.core.app.NotificationCompat; @@ -203,7 +202,7 @@ public void onReceive(Context context, Intent intent) { MmxHelper = new MmxOpenHelper(mContext, app_settings.getDatabaseSettings().getDatabasePath()); db = MmxHelper.getReadableDatabase(); - baseCurencyID = gen_settings.getBaseCurrencytId(); + baseCurencyID = gen_settings.getBaseCurrencyId(); baseAccountID = gen_settings.getDefaultAccountId(); baseAccountName = ""; fromAccountID = -1; diff --git a/app/src/main/java/com/money/manager/ex/settings/AppSettings.java b/app/src/main/java/com/money/manager/ex/settings/AppSettings.java index 7f72b0844e..e31dc419b8 100644 --- a/app/src/main/java/com/money/manager/ex/settings/AppSettings.java +++ b/app/src/main/java/com/money/manager/ex/settings/AppSettings.java @@ -101,7 +101,6 @@ public BudgetSettings getBudgetSettings() { // Individual preferences. public int getPayeeSort() { - int sort = get(R.string.pref_sort_payee, 0); - return sort; + return get(R.string.pref_sort_payee, 0); } } diff --git a/app/src/main/java/com/money/manager/ex/settings/BehaviourSettings.java b/app/src/main/java/com/money/manager/ex/settings/BehaviourSettings.java index d18e326fcd..01014f0277 100644 --- a/app/src/main/java/com/money/manager/ex/settings/BehaviourSettings.java +++ b/app/src/main/java/com/money/manager/ex/settings/BehaviourSettings.java @@ -59,7 +59,6 @@ public boolean getFilterInSelectors() { /** * The period to use for the income/expense summary footer on Home screen. - * @return */ public String getIncomeExpensePeriod() { return get(R.string.pref_income_expense_footer_period, diff --git a/app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsActivity.java b/app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsActivity.java index edd29bbb3b..af27e698cb 100644 --- a/app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsActivity.java +++ b/app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsActivity.java @@ -21,6 +21,8 @@ import android.os.Bundle; import android.widget.Toast; +import androidx.annotation.NonNull; + import com.money.manager.ex.R; public class BehaviourSettingsActivity @@ -34,8 +36,8 @@ protected void onCreate(Bundle savedInstance) { //Author:- velmuruganc - Added for Issue : #1144 - Add automatic bank transaction updates @Override - public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) - { + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); final BehaviourSettings settings = new BehaviourSettings(this); if (requestCode == 1) { diff --git a/app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsFragment.java b/app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsFragment.java index 6aab4d759f..f2e83e9714 100644 --- a/app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsFragment.java +++ b/app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsFragment.java @@ -78,12 +78,9 @@ private void initializeNotificationTime() { Preference preference = findPreference(getString(PreferenceConstants.PREF_REPEATING_TRANSACTION_CHECK)); if (preference == null) return; - Preference.OnPreferenceClickListener listener = new Preference.OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - showTimePicker(); - return true; - } + Preference.OnPreferenceClickListener listener = preference1 -> { + showTimePicker(); + return true; }; preference.setOnPreferenceClickListener(listener); } @@ -123,42 +120,37 @@ private void initializeSmsAutomation() if (preference == null) return; - Preference.OnPreferenceClickListener listener = new Preference.OnPreferenceClickListener() - { - @Override - public boolean onPreferenceClick(Preference preference) + Preference.OnPreferenceClickListener listener = preference1 -> { + + if (Build.VERSION.SDK_INT >= 23) { + //Check the permission exists, if not request the permission from the user + int result = ContextCompat.checkSelfPermission(getActivity(), + Manifest.permission.RECEIVE_SMS); - if (Build.VERSION.SDK_INT >= 23) + if (settings.getBankSmsTrans()) { - //Check the permission exists, if not request the permission from the user - int result = ContextCompat.checkSelfPermission(getActivity(), - Manifest.permission.RECEIVE_SMS); - - if (settings.getBankSmsTrans()) + if (result == PackageManager.PERMISSION_GRANTED) { - if (result == PackageManager.PERMISSION_GRANTED) - { - Toast.makeText(getActivity(), R.string.granted_receive_sms_access, Toast.LENGTH_LONG).show(); - } - else - { - // request for the permission - ActivityCompat.requestPermissions(getActivity(), new String[]{Manifest.permission.RECEIVE_SMS}, 1); - } + Toast.makeText(getActivity(), R.string.granted_receive_sms_access, Toast.LENGTH_LONG).show(); } else { - // remove the permissions - Toast.makeText(getActivity(), R.string.revoke_receive_sms_access, Toast.LENGTH_LONG).show(); - settings.setBankSmsTrans(false); - settings.setSmsTransStatusNotification(false); - + // request for the permission + ActivityCompat.requestPermissions(getActivity(), new String[]{Manifest.permission.RECEIVE_SMS}, 1); } } + else + { + // remove the permissions + Toast.makeText(getActivity(), R.string.revoke_receive_sms_access, Toast.LENGTH_LONG).show(); + settings.setBankSmsTrans(false); + settings.setSmsTransStatusNotification(false); - return true; + } } + + return true; }; preference.setOnPreferenceClickListener(listener); } diff --git a/app/src/main/java/com/money/manager/ex/settings/DatabaseSettings.java b/app/src/main/java/com/money/manager/ex/settings/DatabaseSettings.java index 06e3eb6dc6..4d3c526fed 100644 --- a/app/src/main/java/com/money/manager/ex/settings/DatabaseSettings.java +++ b/app/src/main/java/com/money/manager/ex/settings/DatabaseSettings.java @@ -30,8 +30,7 @@ public DatabaseSettings(AppSettings mainSettings) { private final AppSettings mAppSettings; public String getDatabasePath() { - String path = mAppSettings.get(R.string.pref_database_path, ""); - return path; + return mAppSettings.get(R.string.pref_database_path, ""); } public void setDatabasePath(String path) { diff --git a/app/src/main/java/com/money/manager/ex/settings/DatabaseSettingsFragment.java b/app/src/main/java/com/money/manager/ex/settings/DatabaseSettingsFragment.java index fa4a47e9a9..a11a4223d5 100644 --- a/app/src/main/java/com/money/manager/ex/settings/DatabaseSettingsFragment.java +++ b/app/src/main/java/com/money/manager/ex/settings/DatabaseSettingsFragment.java @@ -19,7 +19,6 @@ import static android.app.Activity.RESULT_OK; import android.content.Intent; -import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.os.Bundle; import android.util.Log; @@ -104,32 +103,29 @@ private void initClearRecentFiles() { Preference preference = findPreference(getString(R.string.pref_clear_recent_files)); if (preference == null) return; - final RecentDatabasesProvider recents = mDatabases.get(); + final RecentDatabasesProvider recent = mDatabases.get(); // show how many items are in the list. - preference.setSummary(Integer.toString(recents.map.size())); - - preference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - // clear recent files list - boolean success = recents.clear(); - // update display value. - showNumberOfRecentFiles(); - - // notification - String message = success - ? getString(R.string.cleared) - : getString(R.string.error); - new UIHelper(getActivity()).showToast(message); - return false; - } + preference.setSummary(Integer.toString(recent.map.size())); + + preference.setOnPreferenceClickListener(preference1 -> { + // clear recent files list + boolean success = recent.clear(); + // update display value. + showNumberOfRecentFiles(); + + // notification + String message = success + ? getString(R.string.cleared) + : getString(R.string.error); + new UIHelper(getActivity()).showToast(message); + return false; }); } private void refreshDbVersion() { - final Preference preference = findPreference(getActivity().getString(R.string.pref_database_version)); + final Preference preference = findPreference(requireActivity().getString(R.string.pref_database_version)); String version = "N/A"; @@ -139,6 +135,7 @@ private void refreshDbVersion() { version = Integer.toString(versionNumber); } + assert preference != null; preference.setSummary(version); } @@ -158,24 +155,19 @@ private void initDbSchemaCheckOption() { preference.setSummary(getString(R.string.db_check_schema_summary)); - Preference.OnPreferenceClickListener clickListener = new Preference.OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - MmxDatabaseUtils db = new MmxDatabaseUtils(getActivity()); + preference.setOnPreferenceClickListener(preference1 -> { + MmxDatabaseUtils db = new MmxDatabaseUtils(getActivity()); - Timber.d("checking db schema"); + Timber.d("checking db schema"); - boolean result = db.checkSchema(); - if (result) { - showToast(R.string.db_check_schema_success, Toast.LENGTH_SHORT); - } else { - showToast(R.string.db_check_schema_error, Toast.LENGTH_SHORT); - } - return false; + boolean result = db.checkSchema(); + if (result) { + showToast(R.string.db_check_schema_success, Toast.LENGTH_SHORT); + } else { + showToast(R.string.db_check_schema_error, Toast.LENGTH_SHORT); } - }; - - preference.setOnPreferenceClickListener(clickListener); + return false; + }); } private void initDatabaseIntegrityOption() { @@ -184,29 +176,24 @@ private void initDatabaseIntegrityOption() { preference.setSummary(getString(R.string.db_check_integrity_summary)); - Preference.OnPreferenceClickListener clickListener = new Preference.OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - MmxDatabaseUtils db = new MmxDatabaseUtils(getActivity()); - boolean result; - try { - Timber.d("checking db integrity."); - - result = db.checkIntegrity(); - - if (result) { - showToast(R.string.db_check_integrity_success, Toast.LENGTH_SHORT); - } else { - showToast(R.string.db_check_integrity_error, Toast.LENGTH_SHORT); - } - } catch (Exception ex) { - Timber.e(ex, "checking integrity"); + preference.setOnPreferenceClickListener(preference1 -> { + MmxDatabaseUtils db = new MmxDatabaseUtils(getActivity()); + boolean result; + try { + Timber.d("checking db integrity."); + + result = db.checkIntegrity(); + + if (result) { + showToast(R.string.db_check_integrity_success, Toast.LENGTH_SHORT); + } else { + showToast(R.string.db_check_integrity_error, Toast.LENGTH_SHORT); } - return false; + } catch (Exception ex) { + Timber.e(ex, "checking integrity"); } - }; - - preference.setOnPreferenceClickListener(clickListener); + return false; + }); } private void requestBackup() { @@ -258,13 +245,9 @@ private void backupDatabase(Uri destinationUri) { private void initExportDbOption() { final Preference pMoveDatabase = findPreference(getString(PreferenceConstants.PREF_DATABASE_BACKUP)); if (pMoveDatabase != null) { - pMoveDatabase.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { - - @Override - public boolean onPreferenceClick(Preference preference) { - requestBackup(); - return false; - } + pMoveDatabase.setOnPreferenceClickListener(preference -> { + requestBackup(); + return false; }); } } @@ -281,7 +264,7 @@ private void initFixDuplicates() { Preference preference = findPreference(getString(R.string.pref_db_fix_duplicates)); if (preference == null) return; - Preference.OnPreferenceClickListener clickListener = new Preference.OnPreferenceClickListener() { + preference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { MmxDatabaseUtils utils = new MmxDatabaseUtils(getActivity()); @@ -299,9 +282,7 @@ public boolean onPreferenceClick(Preference preference) { } return false; } - }; - - preference.setOnPreferenceClickListener(clickListener); + }); } private void showNumberOfRecentFiles() { diff --git a/app/src/main/java/com/money/manager/ex/settings/GeneralSettings.java b/app/src/main/java/com/money/manager/ex/settings/GeneralSettings.java index fba1793d79..d4c19b83ec 100644 --- a/app/src/main/java/com/money/manager/ex/settings/GeneralSettings.java +++ b/app/src/main/java/com/money/manager/ex/settings/GeneralSettings.java @@ -45,8 +45,7 @@ protected SharedPreferences getPreferences() { } public String getApplicationLanguage() { - String result = get(R.string.pref_locale, ""); - return result; + return get(R.string.pref_locale, ""); } /** @@ -85,7 +84,7 @@ public String getTheme() { return get(R.string.pref_theme, lightTheme); } - public Integer getBaseCurrencytId() { + public Integer getBaseCurrencyId() { InfoService service = new InfoService(getContext()); String value = service.getInfoValue(InfoKeys.BASECURRENCYID); diff --git a/app/src/main/java/com/money/manager/ex/settings/GeneralSettingsActivity.java b/app/src/main/java/com/money/manager/ex/settings/GeneralSettingsActivity.java index 40157cf297..9e62801c68 100644 --- a/app/src/main/java/com/money/manager/ex/settings/GeneralSettingsActivity.java +++ b/app/src/main/java/com/money/manager/ex/settings/GeneralSettingsActivity.java @@ -37,8 +37,4 @@ protected void onResume() { setTitle(R.string.preferences_general); } -// @Override -// public boolean onOptionsItemSelected(MenuItem item) { -// return super.onOptionsItemSelected(item); -// } } diff --git a/app/src/main/java/com/money/manager/ex/settings/GeneralSettingsFragment.java b/app/src/main/java/com/money/manager/ex/settings/GeneralSettingsFragment.java index 687dbe2986..76068ca4ed 100644 --- a/app/src/main/java/com/money/manager/ex/settings/GeneralSettingsFragment.java +++ b/app/src/main/java/com/money/manager/ex/settings/GeneralSettingsFragment.java @@ -55,69 +55,57 @@ private void initializeControls() { // Application Locale - final ListPreference lstLocaleApp = (ListPreference) findPreference(getString(R.string.pref_locale)); + final ListPreference lstLocaleApp = findPreference(getString(R.string.pref_locale)); if (lstLocaleApp != null) { String summary = settings.getGeneralSettings().getApplicationLanguage(); setSummaryListPreference(lstLocaleApp, summary, R.array.application_locale_values, R.array.application_locale_entries); - lstLocaleApp.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - String language = String.valueOf(newValue); - setSummaryListPreference(preference, language, R.array.application_locale_values, R.array.application_locale_entries); + lstLocaleApp.setOnPreferenceChangeListener((preference, newValue) -> { + String language = String.valueOf(newValue); + setSummaryListPreference(preference, language, R.array.application_locale_values, R.array.application_locale_entries); - restartActivity(); + restartActivity(); - return true; - } + return true; }); } // Theme - final ListPreference lstTheme = (ListPreference) findPreference(getString(R.string.pref_theme)); + final ListPreference lstTheme = findPreference(getString(R.string.pref_theme)); if (lstTheme != null) { - lstTheme.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - Timber.d("setting theme: %s", newValue.toString()); + lstTheme.setOnPreferenceChangeListener((preference, newValue) -> { + Timber.d("setting theme: %s", newValue.toString()); - restartActivity(); + restartActivity(); - return true; - } + return true; }); } // default status - final ListPreference lstDefaultStatus = (ListPreference) findPreference(getString(PreferenceConstants.PREF_DEFAULT_STATUS)); + final ListPreference lstDefaultStatus = findPreference(getString(PreferenceConstants.PREF_DEFAULT_STATUS)); if (lstDefaultStatus != null) { setSummaryListPreference(lstDefaultStatus, lstDefaultStatus.getValue(), R.array.status_values, R.array.status_items); - lstDefaultStatus.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - setSummaryListPreference(lstDefaultStatus, newValue.toString(), R.array.status_values, R.array.status_items); - return true; - } + lstDefaultStatus.setOnPreferenceChangeListener((preference, newValue) -> { + setSummaryListPreference(lstDefaultStatus, newValue.toString(), R.array.status_values, R.array.status_items); + return true; }); } //default payee - final ListPreference lstDefaultPayee = (ListPreference) findPreference(getString(PreferenceConstants.PREF_DEFAULT_PAYEE)); + final ListPreference lstDefaultPayee = findPreference(getString(PreferenceConstants.PREF_DEFAULT_PAYEE)); if (lstDefaultPayee != null) { setSummaryListPreference(lstDefaultPayee, lstDefaultPayee.getValue(), R.array.new_transaction_dialog_values, R.array.new_transaction_dialog_items); - lstDefaultPayee.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - setSummaryListPreference(lstDefaultPayee, newValue.toString(), R.array.new_transaction_dialog_values, R.array.new_transaction_dialog_items); - return true; - } + lstDefaultPayee.setOnPreferenceChangeListener((preference, newValue) -> { + setSummaryListPreference(lstDefaultPayee, newValue.toString(), R.array.new_transaction_dialog_values, R.array.new_transaction_dialog_items); + return true; }); } // send anonymous usage data - final SwitchPreferenceCompat sPreference = (SwitchPreferenceCompat) findPreference(getString(R.string.pref_anonymous_usage)); + final SwitchPreferenceCompat sPreference = findPreference(getString(R.string.pref_anonymous_usage)); if (sPreference != null) { sPreference.setOnPreferenceChangeListener((preference, newValue) -> { // Handle the switch state change @@ -142,6 +130,6 @@ public void setSummaryListPreference(Preference preference, String value, int id private void restartActivity() { MainActivity.setRestartActivity(true); - getActivity().recreate(); + requireActivity().recreate(); } } diff --git a/app/src/main/java/com/money/manager/ex/settings/InvestmentPreferencesViewHolder.java b/app/src/main/java/com/money/manager/ex/settings/InvestmentPreferencesViewHolder.java index 37c055974f..c685ce3da6 100644 --- a/app/src/main/java/com/money/manager/ex/settings/InvestmentPreferencesViewHolder.java +++ b/app/src/main/java/com/money/manager/ex/settings/InvestmentPreferencesViewHolder.java @@ -29,8 +29,8 @@ public class InvestmentPreferencesViewHolder { public InvestmentPreferencesViewHolder(PreferenceFragmentCompat container) { threshold = container.findPreference(container.getString(R.string.pref_asset_allocation_threshold)); - quoteProvider = (ListPreference) container.findPreference(container.getString(R.string.pref_quote_provider)); - exchangeRateProvider = (ListPreference) container.findPreference(container.getString(R.string.pref_exchange_rate_provider)); + quoteProvider = container.findPreference(container.getString(R.string.pref_quote_provider)); + exchangeRateProvider = container.findPreference(container.getString(R.string.pref_exchange_rate_provider)); } public Preference threshold; diff --git a/app/src/main/java/com/money/manager/ex/settings/LookAndFeelSettings.java b/app/src/main/java/com/money/manager/ex/settings/LookAndFeelSettings.java index 500130f87b..6a75a7edcb 100644 --- a/app/src/main/java/com/money/manager/ex/settings/LookAndFeelSettings.java +++ b/app/src/main/java/com/money/manager/ex/settings/LookAndFeelSettings.java @@ -95,7 +95,7 @@ public boolean getViewOpenAccounts() { // return get(R.string.pref_account_open_visible, true); InfoService infoService = new InfoService(getContext()); String value = infoService.getInfoValue(InfoKeys.SHOW_OPEN_ACCOUNTS); - return Boolean.valueOf(value); + return Boolean.parseBoolean(value); } public void setViewOpenAccounts(Boolean value) { @@ -107,7 +107,7 @@ public boolean getViewFavouriteAccounts() { // return get(R.string.pref_account_fav_visible, true); InfoService infoService = new InfoService(getContext()); String value = infoService.getInfoValue(InfoKeys.SHOW_FAVOURITE_ACCOUNTS); - return Boolean.valueOf(value); + return Boolean.parseBoolean(value); } public void setViewFavouriteAccounts(Boolean value) { diff --git a/app/src/main/java/com/money/manager/ex/settings/LookFeelPreferenceFragment.java b/app/src/main/java/com/money/manager/ex/settings/LookFeelPreferenceFragment.java index 45b13d48d5..1530e18236 100644 --- a/app/src/main/java/com/money/manager/ex/settings/LookFeelPreferenceFragment.java +++ b/app/src/main/java/com/money/manager/ex/settings/LookFeelPreferenceFragment.java @@ -19,7 +19,6 @@ import android.os.Bundle; -import com.google.common.primitives.Ints; import com.money.manager.ex.core.DefinedDateRange; import com.money.manager.ex.core.DefinedDateRangeName; import com.money.manager.ex.core.DefinedDateRanges; @@ -29,7 +28,6 @@ import androidx.preference.CheckBoxPreference; import androidx.preference.ListPreference; -import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceManager; import androidx.preference.SwitchPreferenceCompat; @@ -53,60 +51,48 @@ public void onCreate(Bundle savedInstanceState) { // Show Open accounts - final CheckBoxPreference chkAccountOpen = (CheckBoxPreference) - findPreference(getString(R.string.pref_account_open_visible)); + final CheckBoxPreference chkAccountOpen = findPreference(getString(R.string.pref_account_open_visible)); if (chkAccountOpen != null) { // set initial value - Boolean showOpenAccounts = settings.getViewOpenAccounts(); + boolean showOpenAccounts = settings.getViewOpenAccounts(); chkAccountOpen.setChecked(showOpenAccounts); - chkAccountOpen.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - settings.setViewOpenAccounts((Boolean) newValue); - MainActivity.setRestartActivity(true); - return true; - } + chkAccountOpen.setOnPreferenceChangeListener((preference, newValue) -> { + settings.setViewOpenAccounts((Boolean) newValue); + MainActivity.setRestartActivity(true); + return true; }); } // Show Favourite accounts - final CheckBoxPreference chkAccountFav = (CheckBoxPreference) - findPreference(getString(R.string.pref_account_fav_visible)); + final CheckBoxPreference chkAccountFav = findPreference(getString(R.string.pref_account_fav_visible)); if (chkAccountFav != null) { // set initial value - Boolean showOpenAccounts = settings.getViewFavouriteAccounts(); + boolean showOpenAccounts = settings.getViewFavouriteAccounts(); chkAccountFav.setChecked(showOpenAccounts); - chkAccountFav.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - settings.setViewFavouriteAccounts((Boolean) newValue); - MainActivity.setRestartActivity(true); - return true; - } + chkAccountFav.setOnPreferenceChangeListener((preference, newValue) -> { + settings.setViewFavouriteAccounts((Boolean) newValue); + MainActivity.setRestartActivity(true); + return true; }); } // Hide reconciled amounts setting. - final SwitchPreferenceCompat chkHideReconciled = (SwitchPreferenceCompat) findPreference(getString( + final SwitchPreferenceCompat chkHideReconciled = findPreference(getString( R.string.pref_transaction_hide_reconciled_amounts)); - Preference.OnPreferenceChangeListener listener = new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - MainActivity.setRestartActivity(true); - return true; - } - }; // Set the main activity to restart on change of any of the following preferences. - chkHideReconciled.setOnPreferenceChangeListener(listener); + chkHideReconciled.setOnPreferenceChangeListener((preference, newValue) -> { + MainActivity.setRestartActivity(true); + return true; + }); // Show Transactions, period - final ListPreference lstShow = (ListPreference) findPreference(getString( + final ListPreference lstShow = findPreference(getString( R.string.pref_show_transaction)); if (lstShow != null) { // set the available values for selection. @@ -122,50 +108,40 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { DefinedDateRange range = ranges.get(rangeName); lstShow.setSummary(range.getLocalizedName(getActivity())); - lstShow.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - String newRangeKey = newValue.toString(); - DefinedDateRange range = ranges.getByName(newRangeKey); + lstShow.setOnPreferenceChangeListener((preference, newValue) -> { + String newRangeKey = newValue.toString(); + DefinedDateRange range1 = ranges.getByName(newRangeKey); - lstShow.setSummary(range.getLocalizedName(getActivity())); - return true; - } + lstShow.setSummary(range1.getLocalizedName(getActivity())); + return true; }); } // Font type - final ListPreference lstFont = (ListPreference) findPreference(getString(PreferenceConstants.PREF_APPLICATION_FONT)); + final ListPreference lstFont = findPreference(getString(PreferenceConstants.PREF_APPLICATION_FONT)); if (lstFont != null) { - lstFont.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - Integer newInt = Ints.tryParse(newValue.toString()); - if (newInt != null) { - Timber.d("Preference set: font = %s", newValue.toString()); - - RobotoView.setUserFont(newInt); - return true; - } - return false; + lstFont.setOnPreferenceChangeListener((preference, newValue) -> { + Integer newInt = Integer.parseInt(newValue.toString()); + if (newInt != null) { + Timber.d("Preference set: font = %s", newValue.toString()); + + RobotoView.setUserFont(newInt); + return true; } + return false; }); } // Font size - final ListPreference lstFontSize = (ListPreference) findPreference(getString(PreferenceConstants.PREF_APPLICATION_FONT_SIZE)); + final ListPreference lstFontSize = findPreference(getString(PreferenceConstants.PREF_APPLICATION_FONT_SIZE)); if (lstFontSize != null) { - lstFontSize.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + lstFontSize.setOnPreferenceChangeListener((preference, newValue) -> { + Timber.d("Preference set: font = %s", newValue.toString()); - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - Timber.d("Preference set: font = %s", newValue.toString()); - - RobotoView.setUserFontSize(getActivity().getApplicationContext(), newValue.toString()); - return true; - } + RobotoView.setUserFontSize(getActivity().getApplicationContext(), newValue.toString()); + return true; }); } } diff --git a/app/src/main/java/com/money/manager/ex/settings/PerDatabaseFragment.java b/app/src/main/java/com/money/manager/ex/settings/PerDatabaseFragment.java index 72a8de6736..d288334f6c 100644 --- a/app/src/main/java/com/money/manager/ex/settings/PerDatabaseFragment.java +++ b/app/src/main/java/com/money/manager/ex/settings/PerDatabaseFragment.java @@ -19,7 +19,6 @@ import android.app.AlertDialog; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; @@ -100,19 +99,16 @@ private void initializeControls() { final Preference pUserName = findPreference(getString(R.string.pref_user_name)); if (pUserName != null) { pUserName.setSummary(MmexApplication.getApp().getUserName()); - pUserName.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - MmexApplication.getApp().setUserName((String) newValue, true); - pUserName.setSummary(MmexApplication.getApp().getUserName()); - return false; - } + pUserName.setOnPreferenceChangeListener((preference, newValue) -> { + MmexApplication.getApp().setUserName((String) newValue, true); + pUserName.setSummary(MmexApplication.getApp().getUserName()); + return false; }); } // Date format - final ListPreference lstDateFormat = (ListPreference) findPreference(getString(R.string.pref_date_format)); + final ListPreference lstDateFormat = findPreference(getString(R.string.pref_date_format)); if (lstDateFormat != null) { //set summary String value = infoService.getInfoValue(InfoKeys.DATEFORMAT); @@ -120,16 +116,12 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { lstDateFormat.setValue(value); //on change - lstDateFormat.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - if (infoService.setInfoValue(InfoKeys.DATEFORMAT, (String) newValue)) { - lstDateFormat.setSummary(getDateFormatFromMask((String) newValue)); - } - // Do not update to preferences file. - return false; + lstDateFormat.setOnPreferenceChangeListener((preference, newValue) -> { + if (infoService.setInfoValue(InfoKeys.DATEFORMAT, (String) newValue)) { + lstDateFormat.setSummary(getDateFormatFromMask((String) newValue)); } + // Do not update to preferences file. + return false; }); } @@ -146,30 +138,27 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { pFinancialDay.setDefaultValue(pFinancialDay.getSummary().toString()); } - pFinancialDay.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - int day; - try { - day = Integer.parseInt((String) newValue); - } catch (NumberFormatException e) { - new UIHelper(getActivity()).showToast(R.string.error_parsing_value); + pFinancialDay.setOnPreferenceChangeListener((preference, newValue) -> { + int day; + try { + day = Integer.parseInt((String) newValue); + } catch (NumberFormatException e) { + new UIHelper(getActivity()).showToast(R.string.error_parsing_value); + return false; + } + + try { + if (day < 1 || day > 31) { return false; } - - try { - if (day < 1 || day > 31) { - return false; - } - if (infoService.setInfoValue(InfoKeys.FINANCIAL_YEAR_START_DAY, Integer.toString(day))) { - pFinancialDay.setSummary(Integer.toString(day)); - } -// return true; - } catch (Exception e) { - Timber.e(e, "changing the start day of the financial year"); + if (infoService.setInfoValue(InfoKeys.FINANCIAL_YEAR_START_DAY, Integer.toString(day))) { + pFinancialDay.setSummary(Integer.toString(day)); } - return false; +// return true; + } catch (Exception e) { + Timber.e(e, "changing the start day of the financial year"); } + return false; }); } @@ -177,7 +166,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { // Financial year/month - final ListPreference lstFinancialMonth = (ListPreference) findPreference(getString(PreferenceConstants.PREF_FINANCIAL_YEAR_STARTMONTH)); + final ListPreference lstFinancialMonth = findPreference(getString(PreferenceConstants.PREF_FINANCIAL_YEAR_STARTMONTH)); if (lstFinancialMonth != null) { lstFinancialMonth.setEntries(core.getListMonths()); lstFinancialMonth.setEntryValues(new String[]{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"}); @@ -198,22 +187,18 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { } catch (Exception e) { Timber.e(e, "showing the month of the financial year"); } - lstFinancialMonth.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - try { - int value = Integer.parseInt(newValue.toString()); - if (value > -1 && value < lstFinancialMonth.getEntries().length) { - if (infoService.setInfoValue(InfoKeys.FINANCIAL_YEAR_START_MONTH, Integer.toString(value + 1))) { - lstFinancialMonth.setSummary(lstFinancialMonth.getEntries()[value]); - } + lstFinancialMonth.setOnPreferenceChangeListener((preference, newValue) -> { + try { + int value = Integer.parseInt(newValue.toString()); + if (value > -1 && value < lstFinancialMonth.getEntries().length) { + if (infoService.setInfoValue(InfoKeys.FINANCIAL_YEAR_START_MONTH, Integer.toString(value + 1))) { + lstFinancialMonth.setSummary(lstFinancialMonth.getEntries()[value]); } - } catch (Exception e) { - Timber.e(e, "changing the month of the financial year"); } - return false; + } catch (Exception e) { + Timber.e(e, "changing the month of the financial year"); } + return false; }); } @@ -233,19 +218,14 @@ private void initBaseCurrency() { // After the currency is selected in the Currencies screen, the change is handled // in onActivityResult - Preference.OnPreferenceClickListener clickListener = new Preference.OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - // show the currencies activity - Intent intent = new Intent(getActivity(), CurrencyListActivity.class); - intent.setAction(Intent.ACTION_PICK); - startActivityForResult(intent, REQUEST_PICK_CURRENCY); + baseCurrency.setOnPreferenceClickListener(preference -> { + // show the currencies activity + Intent intent = new Intent(getActivity(), CurrencyListActivity.class); + intent.setAction(Intent.ACTION_PICK); + startActivityForResult(intent, REQUEST_PICK_CURRENCY); - return true; - } - }; - - baseCurrency.setOnPreferenceClickListener(clickListener); + return true; + }); } private String getDateFormatFromMask(String mask) { @@ -260,7 +240,7 @@ private String getDateFormatFromMask(String mask) { } private void initDefaultAccount() { - ListPreference preference = (ListPreference) findPreference(getString(R.string.pref_default_account)); + ListPreference preference = findPreference(getString(R.string.pref_default_account)); if (preference == null) return; AccountService accountService = new AccountService(getActivity()); @@ -292,20 +272,17 @@ private void initDefaultAccount() { } preference.setSummary(accountName); - preference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - String accountName = entries[0]; - int accountId = Integer.parseInt(newValue.toString()); - if (accountId != Constants.NOT_SET) { - accountName = repository.loadName(accountId); - } - preference.setSummary(accountName); + preference.setOnPreferenceChangeListener((preference1, newValue) -> { + String accountName1 = entries[0]; + int accountId = Integer.parseInt(newValue.toString()); + if (accountId != Constants.NOT_SET) { + accountName1 = repository.loadName(accountId); + } + preference1.setSummary(accountName1); - new GeneralSettings(getActivity()).setDefaultAccountId(accountId); + new GeneralSettings(getActivity()).setDefaultAccountId(accountId); - return true; - } + return true; }); } @@ -326,19 +303,13 @@ private void showCurrencyChangeNotification() { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(R.string.base_currency_changed) .setMessage(R.string.base_currency_change_notification) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - // Positive button click action (if needed) - } + .setPositiveButton(android.R.string.ok, (dialog, which) -> { + // Positive button click action (if needed) }) - .setNeutralButton(R.string.open_currencies, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - Intent intent = new Intent(getActivity(), CurrencyListActivity.class); - intent.setAction(Intent.ACTION_EDIT); - startActivity(intent); - } + .setNeutralButton(R.string.open_currencies, (dialog, which) -> { + Intent intent = new Intent(getActivity(), CurrencyListActivity.class); + intent.setAction(Intent.ACTION_EDIT); + startActivity(intent); }) .show(); }