From 0d54a687d6e460bcad65d519ae0d49f8d1492c84 Mon Sep 17 00:00:00 2001
From: Fabian Henneke <FabianHenneke@users.noreply.github.com>
Date: Tue, 14 Apr 2020 00:21:59 +0200
Subject: Fix repository corruption by AutofillSaveActivity (#699)

---
 app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java')

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
index a33ec221..d07bd791 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
+++ b/app/src/main/java/com/zeapo/pwdstore/git/GitAsyncTask.java
@@ -6,6 +6,7 @@ package com.zeapo.pwdstore.git;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.content.Intent;
 import android.os.AsyncTask;
 import com.zeapo.pwdstore.PasswordStore;
 import com.zeapo.pwdstore.R;
@@ -22,20 +23,20 @@ import org.eclipse.jgit.transport.RemoteRefUpdate;
 
 public class GitAsyncTask extends AsyncTask<GitCommand, Integer, String> {
     private WeakReference<Activity> activityWeakReference;
-    private boolean finishOnEnd;
     private boolean refreshListOnEnd;
     private ProgressDialog dialog;
     private GitOperation operation;
+    private Intent finishWithResultOnEnd;
 
     public GitAsyncTask(
             Activity activity,
-            boolean finishOnEnd,
             boolean refreshListOnEnd,
-            GitOperation operation) {
+            GitOperation operation,
+            Intent finishWithResultOnEnd) {
         this.activityWeakReference = new WeakReference<>(activity);
-        this.finishOnEnd = finishOnEnd;
         this.refreshListOnEnd = refreshListOnEnd;
         this.operation = operation;
+        this.finishWithResultOnEnd = finishWithResultOnEnd;
 
         dialog = new ProgressDialog(getActivity());
     }
@@ -124,8 +125,8 @@ public class GitAsyncTask extends AsyncTask<GitCommand, Integer, String> {
         } else {
             this.operation.onSuccess();
 
-            if (finishOnEnd) {
-                this.getActivity().setResult(Activity.RESULT_OK);
+            if (finishWithResultOnEnd != null) {
+                this.getActivity().setResult(Activity.RESULT_OK, finishWithResultOnEnd);
                 this.getActivity().finish();
             }
 
-- 
cgit v1.2.3