From 3ca806d699182f3233c2425bd407988540083758 Mon Sep 17 00:00:00 2001
From: zeapo <mohamed@zenadi.com>
Date: Thu, 18 Dec 2014 21:52:38 +0100
Subject: set credential after they've been intialized

---
 .../main/java/com/zeapo/pwdstore/git/PullOperation.java    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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

diff --git a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
index 0d43216d..2d499b4e 100644
--- a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
+++ b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java
@@ -2,9 +2,8 @@ package com.zeapo.pwdstore.git;
 
 import android.app.Activity;
 
-import com.zeapo.pwdstore.utils.PasswordRepository;
-
 import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.PullCommand;
 
 import java.io.File;
 
@@ -29,8 +28,15 @@ public class PullOperation extends GitOperation {
         this.command = new Git(repository)
                 .pull()
                 .setRebase(true)
-                .setRemote("origin")
-                .setCredentialsProvider(provider);
+                .setRemote("origin");
         return this;
     }
+
+    @Override
+    public void execute() throws Exception  {
+        if (this.provider != null) {
+            ((PullCommand) this.command).setCredentialsProvider(this.provider);
+        }
+        new GitAsyncTask(callingActivity, true, false, PullCommand.class).execute(this.command);
+    }
 }
-- 
cgit v1.2.3