Merge pull request #1989 from moneymanagerex/replace2ignore

CONFLICT_REPLACE to CONFLICT_IGNORE
moneymanagerex · Dec 21, 2024 · 0aab1fd · 0aab1fd
2 parents d8b00e8 + c9f2e74
commit 0aab1fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/src/main/java/com/money/manager/ex/MmxContentProvider.java b/app/src/main/java/com/money/manager/ex/MmxContentProvider.java
@@ -16,7 +16,7 @@
  */
 package com.money.manager.ex;
 
-import static android.database.sqlite.SQLiteDatabase.CONFLICT_REPLACE;
+import static android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -169,7 +169,7 @@ public Uri insert(@NonNull Uri uri, ContentValues values) {
                     initializeDependencies();
 
                     id = openHelper.get().getWritableDatabase()
-                            .insert(dataset.getSource(), CONFLICT_REPLACE, values);
+                            .insert(dataset.getSource(), CONFLICT_IGNORE, values);
                     //database.setTransactionSuccessful();
                 } catch (Exception e) {
                     Timber.e(e, "inserting: %s", "insert");
@@ -203,7 +203,7 @@ public int update(@NonNull Uri uri, ContentValues values, String whereClause, St
                 logUpdate(dataset, values, whereClause, whereArgs);
 
                 try {
-                    rowsUpdate = database.update(dataset.getSource(), CONFLICT_REPLACE, values, whereClause, whereArgs);
+                    rowsUpdate = database.update(dataset.getSource(), CONFLICT_IGNORE, values, whereClause, whereArgs);
                 } catch (Exception ex) {
                     Timber.e(ex, "updating: %s", "update");
                 }

diff --git a/app/src/main/java/com/money/manager/ex/payee/PayeeListFragment.java b/app/src/main/java/com/money/manager/ex/payee/PayeeListFragment.java
@@ -383,7 +383,7 @@ public void onClick(DialogInterface dialog, int which) {
                         switch (type) {
                             case INSERT:
                                 Payee payee = service.createNew(name);
-                                if (payee != null) {
+                                if (payee != null && payee.getId() != null) {
                                     // Created a new payee. But only if picking a payee for another activity.
                                     if (mAction.equalsIgnoreCase(Intent.ACTION_PICK)) {
                                         // Select it and close.