mir/Android-Password-Store
2
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store synced 2025-08-31 06:15:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't show the 'directory already exists' error if it's just a .git folder & show all exceptions to the user (e.g. invalid private key)

Browse Source
This commit is contained in:
Matthew Wong
2016-07-29 20:41:40 -04:00
parent cd02d6fe9e
commit 33cebc8a49
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
View File

@@ -475,7 +475,9 @@ public class GitActivity extends AppCompatActivity {
if (!saveConfiguration()) if (!saveConfiguration())
return; return;
if (localDir.exists() && localDir.listFiles().length != 0) { // Warn if non-empty folder unless it's a just-initialized store that has just a .git folder
if (localDir.exists() && localDir.listFiles().length != 0
&& !(localDir.listFiles().length == 1 && localDir.listFiles()[0].getName().equals(".git"))) {
new AlertDialog.Builder(this). new AlertDialog.Builder(this).
setTitle(R.string.dialog_delete_title). setTitle(R.string.dialog_delete_title).
setMessage(getResources().getString(R.string.dialog_delete_msg) + " " + localDir.toString()). setMessage(getResources().getString(R.string.dialog_delete_msg) + " " + localDir.toString()).
@@ -493,13 +495,16 @@ public class GitActivity extends AppCompatActivity {
//This is what happens when jgit fails :( //This is what happens when jgit fails :(
//TODO Handle the diffent cases of exceptions //TODO Handle the diffent cases of exceptions
e.printStackTrace(); e.printStackTrace();
new AlertDialog.Builder(GitActivity.this).
setMessage(e.getMessage()).
show();
} }
} catch (IOException e) { } catch (IOException e) {
//TODO Handle the exception correctly if we are unable to delete the directory... //TODO Handle the exception correctly if we are unable to delete the directory...
e.printStackTrace(); e.printStackTrace();
} catch (Exception e) { new AlertDialog.Builder(GitActivity.this).
//This is what happens when jgit fails :( setMessage(e.getMessage()).
//TODO Handle the diffent cases of exceptions show();
} }
dialog.cancel(); dialog.cancel();
@@ -516,6 +521,10 @@ public class GitActivity extends AppCompatActivity {
show(); show();
} else { } else {
try { try {
// Silently delete & replace the lone .git folder if it exists
if (localDir.listFiles().length == 1 && localDir.listFiles()[0].getName().equals(".git")) {
FileUtils.deleteDirectory(localDir);
}
new CloneOperation(localDir, activity) new CloneOperation(localDir, activity)
.setCommand(hostname) .setCommand(hostname)
.executeAfterAuthentication(connectionMode, settings.getString("git_remote_username", "git"), new File(getFilesDir() + "/.ssh_key")); .executeAfterAuthentication(connectionMode, settings.getString("git_remote_username", "git"), new File(getFilesDir() + "/.ssh_key"));
@@ -523,6 +532,9 @@ public class GitActivity extends AppCompatActivity {
//This is what happens when jgit fails :( //This is what happens when jgit fails :(
//TODO Handle the diffent cases of exceptions //TODO Handle the diffent cases of exceptions
e.printStackTrace(); e.printStackTrace();
new AlertDialog.Builder(this).
setMessage(e.getMessage()).
show();
} }
} }
} }