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

some tweak, and forgot strings

Browse source
This commit is contained in:
zeapo 2015-01-04 18:58:59 +01:00
parent d5e124308e
commit 1c2b000847
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java
View file

@ -79,7 +79,6 @@ public class GitActivityClone extends ActivityInstrumentationTestCase2<GitActivi
gitActivity.runOnUiThread(new Runnable() {
public void run() {
protocolSpinner.setSelection(0); // ssh://
connectionModeSpinner.setSelection(1); // user/pwd
}
});
@ -92,11 +91,11 @@ public class GitActivityClone extends ActivityInstrumentationTestCase2<GitActivi
solo.clearEditText(server_url);
solo.enterText(server_url, "192.168.1.28");
mInstrumentation.waitForIdleSync();
gitActivity.runOnUiThread(new Runnable() {
public void run() {
connectionModeSpinner.setSelection(1); // user/pwd
((Button) gitActivity.findViewById(R.id.clone_button)).performClick();
}
});

3
app/src/main/java/com/zeapo/pwdstore/UserPreference.java
View file

@ -10,6 +10,7 @@ import android.preference.PreferenceFragment;
import android.support.v7.app.ActionBarActivity;
import android.util.Log;
import android.view.MenuItem;
import android.widget.Toast;
import com.zeapo.pwdstore.crypto.PgpHandler;
import com.zeapo.pwdstore.git.GitActivity;
@ -153,7 +154,7 @@ public class UserPreference extends ActionBarActivity implements Preference.OnPr
{
try {
copySshKey(data.getData());
Log.i("PREF", "Got key");
Toast.makeText(this, this.getResources().getString(R.string.ssh_key_success_dialog_title), Toast.LENGTH_LONG).show();
setResult(RESULT_OK);
finish();
} catch (IOException e)

1
app/src/main/res/values/strings.xml
View file

@ -108,6 +108,7 @@
<string name="pref_password_dialog_title">Set the time you want the password to be in clipboard</string>
<string name="pref_copy_title">Automatically Copy Password</string>
<string name="pref_copy_dialog_title">Automatically copy the password to the clipboard after decryption was successful.</string>
<string name="ssh_key_success_dialog_title" translatable="false">SSH-key imported</string>
<string name="ssh_key_error_dialog_title">Error while trying to import the ssh-key</string>
<string name="ssh_key_error_dialog_text">Message : \n</string>
<string name="pref_recursive_filter">Recursive filtering</string>