aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
diff options
context:
space:
mode:
authorknuthy <knuthy@gmail.com>2014-09-20 20:30:24 +0200
committerknuthy <knuthy@gmail.com>2014-09-20 20:30:24 +0200
commitc73517056c227e056831ccfca837633e5a97532e (patch)
tree09a880af68d14766e679e6cf6da075616eae6479 /app/src/main/java/com/zeapo/pwdstore/GitHandler.java
parentac6522cb9405d5d12a93fe955d2fc24351380c11 (diff)
downloadHardenedPass-c73517056c227e056831ccfca837633e5a97532e.tar.gz
HardenedPass-c73517056c227e056831ccfca837633e5a97532e.zip
corrected a major bug with kitkat when selecting sshkey
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/GitHandler.java')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/GitHandler.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
index 38af8a81..ecbf68af 100644
--- a/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
+++ b/app/src/main/java/com/zeapo/pwdstore/GitHandler.java
@@ -75,6 +75,8 @@ public class GitHandler extends Activity {
public static final int REQUEST_CLONE = 103;
public static final int REQUEST_INIT = 104;
+ private static final int GET_SSH_KEY = 201;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -582,7 +584,7 @@ public class GitHandler extends Activity {
public void onClick(DialogInterface dialog, int id) {
try {
Intent intent = new Intent(getApplicationContext(), UserPreference.class);
- startActivity(intent);
+ startActivityForResult(intent, GET_SSH_KEY);
} catch (Exception e) {
System.out.println("Exception caught :(");
e.printStackTrace();
@@ -691,6 +693,8 @@ public class GitHandler extends Activity {
case REQUEST_PUSH:
authenticateAndRun("pushOperation");
break;
+ case GET_SSH_KEY:
+ authenticateAndRun("pullOperation");
}
}