Skip to content

Commit

Permalink
Merge pull request #1726 from moneymanagerex/scheduled
Browse files Browse the repository at this point in the history 
continue code clean up
  • Loading branch information
@guanlisheng
guanlisheng authored Jun 24, 2024
2 parents 7c1d897 + 720bc81 commit 6b05de1
Show file tree
Hide file tree
Showing 16 changed files with 202 additions and 360 deletions.
1 change: 0 additions & 1 deletion app/src/main/java/com/money/manager/ex/MmexApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
58 changes: 0 additions & 58 deletions app/src/main/java/com/money/manager/ex/log/CrashReportingTree.java
View file

This file was deleted.

3 changes: 1 addition & 2 deletions app/src/main/java/com/money/manager/ex/notifications/SmsReceiverTransactions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/money/manager/ex/settings/AppSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
1 change: 0 additions & 1 deletion app/src/main/java/com/money/manager/ex/settings/BehaviourSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) {
Expand Down
54 changes: 23 additions & 31 deletions app/src/main/java/com/money/manager/ex/settings/BehaviourSettingsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/money/manager/ex/settings/DatabaseSettings.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
115 changes: 48 additions & 67 deletions app/src/main/java/com/money/manager/ex/settings/DatabaseSettingsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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";

Expand All @@ -139,6 +135,7 @@ private void refreshDbVersion() {
version = Integer.toString(versionNumber);
}

assert preference != null;
preference.setSummary(version);
}

Expand All @@ -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() {
Expand All @@ -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() {
Expand Down Expand Up @@ -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;
});
}
}
Expand All @@ -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());
Expand All @@ -299,9 +282,7 @@ public boolean onPreferenceClick(Preference preference) {
}
return false;
}
};

preference.setOnPreferenceClickListener(clickListener);
});
}

private void showNumberOfRecentFiles() {
Expand Down
Loading

0 comments on commit 6b05de1

Please sign in to comment.