Merge remote-tracking branch 'remotes/origin/bugfix-46' into ExportCsv

SecUSo · Jan 31, 2023 · de77321 · de77321
2 parents 17a3463 + afa54a3
commit de77321
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...va/org/secuso/privacyfriendlyfinance/activities/viewmodel/TransactionDialogViewModel.java b/...va/org/secuso/privacyfriendlyfinance/activities/viewmodel/TransactionDialogViewModel.java
@@ -232,7 +232,9 @@ public void setCategoryIndex(int categoryIndex) {
 
 
     public void submit() {
-        transaction.setName(transaction.getName().trim());
+        if (transaction.getName() != null) {
+            transaction.setName(transaction.getName().trim());
+        }
         transactionDao.updateOrInsertAsync(transaction);
     }
 

diff --git a/app/src/main/java/org/secuso/privacyfriendlyfinance/backup/BackupCreator.java b/app/src/main/java/org/secuso/privacyfriendlyfinance/backup/BackupCreator.java
@@ -23,7 +23,7 @@
 
 public class BackupCreator implements IBackupCreator {
     @Override
-    public void writeBackup(@NonNull Context context, @NonNull OutputStream outputStream) {
+    public boolean writeBackup(@NonNull Context context, @NonNull OutputStream outputStream) {
         JsonWriter writer = new JsonWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8));
         writer.setIndent("");
 
@@ -62,5 +62,6 @@ public void postKey(SQLiteDatabase database) {
         } catch (Exception e) {
             Log.e("PFA BackupCreator", "Error occurred", e);
         }
+        return true;
     }
 }