diff options
| author | zeapo <mohamed@zenadi.com> | 2015-01-04 18:58:59 +0100 |
|---|---|---|
| committer | zeapo <mohamed@zenadi.com> | 2015-01-04 18:58:59 +0100 |
| commit | 1c2b000847b73c482154f5ccc15cf2cfb9865c4d (patch) | |
| tree | 5a7bb624b034a7480d7dcd3bbff75c4e4d69b4b6 /app/src | |
| parent | d5e124308e4ce1a894a0108d9ea716250ac55359 (diff) | |
some tweak, and forgot strings
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java | 3 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/UserPreference.java | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java b/app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java index efe67d8b..10d33472 100644 --- a/app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java +++ b/app/src/androidTest/java/com/zeapo/pwdstore/GitActivityClone.java @@ -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(); } }); diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java index 65c7e484..43198738 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java @@ -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) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1167c5af..1d5ac4a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -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> |