aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
diff options
context:
space:
mode:
authorMohamed Zenadi <zeapo@users.noreply.github.com>2015-01-04 21:49:56 +0100
committerMohamed Zenadi <zeapo@users.noreply.github.com>2015-01-04 21:49:56 +0100
commitdf8994d84f3923ba64cb36ecdad54aa29e28f2a0 (patch)
tree7eb85fa141183222ca565cb8ee6d5c977cd88729 /app/src/main/java/com/zeapo/pwdstore/UserPreference.java
parent33689cefc7a429e4f51607a013f6adc9c01ede94 (diff)
parent6922652173e05433bb9524b036baafb96c91ca1b (diff)
downloadHardenedPass-df8994d84f3923ba64cb36ecdad54aa29e28f2a0.tar.gz
HardenedPass-df8994d84f3923ba64cb36ecdad54aa29e28f2a0.zip
Merge pull request #57 from zeapo/feature/refactor-git
Refactoring of the git process
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/UserPreference.java')
-rw-r--r--app/src/main/java/com/zeapo/pwdstore/UserPreference.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
index 89c1cd36..43198738 100644
--- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
+++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java
@@ -10,9 +10,10 @@ 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.GitHandler;
+import com.zeapo.pwdstore.git.GitActivity;
import com.zeapo.pwdstore.utils.PasswordRepository;
import org.apache.commons.io.FileUtils;
@@ -105,8 +106,8 @@ public class UserPreference extends ActionBarActivity implements Preference.OnPr
break;
case "git_server_info":
{
- Intent intent = new Intent(this, GitHandler.class);
- intent.putExtra("Operation", GitHandler.EDIT_SERVER);
+ Intent intent = new Intent(this, GitActivity.class);
+ intent.putExtra("Operation", GitActivity.EDIT_SERVER);
startActivityForResult(intent, EDIT_GIT_INFO);
}
break;
@@ -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)