kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

check for blank username & update 'hostname' all in saveConfiguration()

Browse source
This commit is contained in:
Matthew Wong 2015-12-23 18:19:25 -05:00
parent 23c5603b7f
commit 406d6c0425
1 changed files with 30 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java
View file

@ -400,49 +400,10 @@ public class GitActivity extends AppCompatActivity {
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
/**
* Prepends the proper protocol to the hostname expected by jGit addRemote().
*/
private void prependProtocol() {
hostname = ((EditText) findViewById(R.id.clone_uri)).getText().toString();
port = ((EditText) findViewById(R.id.server_port)).getText().toString();
// don't ask the user, take off the protocol that he puts in
hostname = hostname.replaceFirst("^.+://", "");
((TextView) findViewById(R.id.clone_uri)).setText(hostname);
// now cheat a little and prepend the real protocol
// jGit does not accept a ssh:// but requires https://
if (!protocol.equals("ssh://")) {
hostname = protocol + hostname;
} else {
// if the port is explicitly given, jgit requires the ssh://
if (!port.isEmpty())
hostname = protocol + hostname;
}
}
private boolean forgotUsername() {
if (protocol.equals("ssh://")) {
// did he forget the username?
if (!hostname.matches("^.+@.+")) {
new AlertDialog.Builder(this).
setMessage(activity.getResources().getString(R.string.forget_username_dialog_text)).
setPositiveButton(activity.getResources().getString(R.string.dialog_oops), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
}
}).
show();
return true;
}
}
return false;
}
/** /**
* Saves the configuration found in the form * Saves the configuration found in the form
*/ */
private void saveConfiguration() { private boolean saveConfiguration() {
// remember the settings // remember the settings
SharedPreferences.Editor editor = settings.edit(); SharedPreferences.Editor editor = settings.edit();
@ -454,9 +415,31 @@ public class GitActivity extends AppCompatActivity {
editor.putString("git_remote_port", ((EditText) findViewById(R.id.server_port)).getText().toString()); editor.putString("git_remote_port", ((EditText) findViewById(R.id.server_port)).getText().toString());
editor.putString("git_remote_uri", ((EditText) findViewById(R.id.clone_uri)).getText().toString()); editor.putString("git_remote_uri", ((EditText) findViewById(R.id.clone_uri)).getText().toString());
// update hostname variable for use by addRemote() either here or later // 'save' hostname variable for use by addRemote() either here or later
// in syncRepository() // in syncRepository()
prependProtocol(); hostname = ((EditText) findViewById(R.id.clone_uri)).getText().toString();
port = ((EditText) findViewById(R.id.server_port)).getText().toString();
// don't ask the user, take off the protocol that he puts in
hostname = hostname.replaceFirst("^.+://", "");
((TextView) findViewById(R.id.clone_uri)).setText(hostname);
if (!protocol.equals("ssh://")) {
hostname = protocol + hostname;
} else {
// if the port is explicitly given, jgit requires the ssh://
if (!port.isEmpty())
hostname = protocol + hostname;
// did he forget the username?
if (!hostname.matches("^.+@.+")) {
new AlertDialog.Builder(this).
setMessage(activity.getResources().getString(R.string.forget_username_dialog_text)).
setPositiveButton(activity.getResources().getString(R.string.dialog_oops), null).
show();
return false;
}
}
if (PasswordRepository.isInitialized()) { if (PasswordRepository.isInitialized()) {
// don't just use the clone_uri text, need to use hostname which has // don't just use the clone_uri text, need to use hostname which has
// had the proper protocol prepended // had the proper protocol prepended
@ -464,6 +447,7 @@ public class GitActivity extends AppCompatActivity {
} }
editor.apply(); editor.apply();
return true;
} }
/** /**
@ -472,9 +456,8 @@ public class GitActivity extends AppCompatActivity {
* @param view * @param view
*/ */
public void saveConfiguration(View view) { public void saveConfiguration(View view) {
if (forgotUsername()) return; if (!saveConfiguration())
return;
saveConfiguration();
finish(); finish();
} }
@ -489,9 +472,8 @@ public class GitActivity extends AppCompatActivity {
} }
localDir = PasswordRepository.getWorkTree(); localDir = PasswordRepository.getWorkTree();
if (forgotUsername()) return; if (!saveConfiguration())
return;
saveConfiguration();
if (localDir.exists() && localDir.listFiles().length != 0) { if (localDir.exists() && localDir.listFiles().length != 0) {
new AlertDialog.Builder(this). new AlertDialog.Builder(this).