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

https repositories works now, bump version to v1.2-a6

Browse Source
This commit is contained in:
zeapo
2014-11-25 22:38:41 +01:00
parent b991b2b14d
commit b20917224f
2 changed files with 27 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -9,8 +9,8 @@ android {
applicationId "com.zeapo.pwdstore" applicationId "com.zeapo.pwdstore"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 21 targetSdkVersion 21
versionCode 24 versionCode 25
versionName "1.2-a5" versionName "1.2-a6"
} }
compileOptions { compileOptions {

95
app/src/main/java/com/zeapo/pwdstore/GitHandler.java
View File

@@ -146,17 +146,6 @@ public class GitHandler extends ActionBarActivity {
// select user/pwd auth-mode and disable the spinner // select user/pwd auth-mode and disable the spinner
connection_mode_spinner.setSelection(1); connection_mode_spinner.setSelection(1);
connection_mode_spinner.setEnabled(false); connection_mode_spinner.setEnabled(false);
new AlertDialog.Builder(activity).
setMessage(activity.getResources().getString(R.string.read_only_dialog_text)).
setCancelable(true).
setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
}
}).show();
} }
} }
@@ -483,8 +472,6 @@ public class GitHandler extends ActionBarActivity {
if (!port.isEmpty()) if (!port.isEmpty())
hostname = protocol + hostname; hostname = protocol + hostname;
Log.i("GIT", "> " + port);
// did he forget the username? // did he forget the username?
if (!hostname.matches("^.+@.+")) { if (!hostname.matches("^.+@.+")) {
new AlertDialog.Builder(this). new AlertDialog.Builder(this).
@@ -743,67 +730,35 @@ public class GitHandler extends ActionBarActivity {
}).show(); }).show();
} }
} else { } else {
if (protocol.equals("ssh://")) { final EditText password = new EditText(activity);
final EditText password = new EditText(activity); password.setHint("Password");
password.setHint("Password"); password.setWidth(LinearLayout.LayoutParams.MATCH_PARENT);
password.setWidth(LinearLayout.LayoutParams.MATCH_PARENT); password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
new AlertDialog.Builder(activity) new AlertDialog.Builder(activity)
.setTitle(activity.getResources().getString(R.string.passphrase_dialog_title)) .setTitle(activity.getResources().getString(R.string.passphrase_dialog_title))
.setMessage(activity.getResources().getString(R.string.password_dialog_text)) .setMessage(activity.getResources().getString(R.string.password_dialog_text))
.setView(password) .setView(password)
.setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() { .setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) { public void onClick(DialogInterface dialog, int whichButton) {
SshSessionFactory.setInstance(new GitConfigSessionFactory());
try {
method.invoke(activity,
new UsernamePasswordCredentialsProvider(
settings.getString("git_remote_username", "git"),
password.getText().toString())
);
} catch (Exception e){
e.printStackTrace();
}
SshSessionFactory.setInstance(new GitConfigSessionFactory());
try {
method.invoke(activity,
new UsernamePasswordCredentialsProvider(
settings.getString("git_remote_username", "git"),
password.getText().toString())
);
} catch (Exception e){
e.printStackTrace();
} }
}).setNegativeButton(activity.getResources().getString(R.string.dialog_cancel), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
// Do nothing.
}
}).show();
} else {
final EditText password = new EditText(activity);
password.setHint("Password");
password.setWidth(LinearLayout.LayoutParams.MATCH_PARENT);
password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
new AlertDialog.Builder(activity) }
.setTitle(activity.getResources().getString(R.string.passphrase_dialog_title)) }).setNegativeButton(activity.getResources().getString(R.string.dialog_cancel), new DialogInterface.OnClickListener() {
.setMessage(activity.getResources().getString(R.string.password_dialog_text)) public void onClick(DialogInterface dialog, int whichButton) {
.setView(password) // Do nothing.
.setPositiveButton(activity.getResources().getString(R.string.dialog_ok), new DialogInterface.OnClickListener() { }
public void onClick(DialogInterface dialog, int whichButton) { }).show();
SshSessionFactory.setInstance(new GitConfigSessionFactory());
try {
method.invoke(activity,
new UsernamePasswordCredentialsProvider(
settings.getString("git_remote_username", "zeapo"),
password.getText().toString())
);
} catch (Exception e){
e.printStackTrace();
}
}
}).setNegativeButton(activity.getResources().getString(R.string.dialog_cancel), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
// Do nothing.
}
}).show();
}
} }
} }