diff options
Diffstat (limited to 'app/src/main')
4 files changed, 20 insertions, 7 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0789fd33..404a5138 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.zeapo.pwdstore"> + xmlns:tools="http://schemas.android.com/tools" + package="com.zeapo.pwdstore"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> @@ -8,7 +9,8 @@ <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" /> <application android:allowBackup="true" android:icon="@drawable/ic_launcher" - android:label="@string/app_name" android:theme="@style/AppTheme"> + android:label="@string/app_name" android:theme="@style/AppTheme" + tools:replace="android:theme"> <activity android:name=".PasswordStore" android:label="@string/app_name" android:configChanges="orientation|screenSize"> <intent-filter> diff --git a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java index 33b6bd29..83a21266 100644 --- a/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java +++ b/app/src/main/java/com/zeapo/pwdstore/PasswordStore.java @@ -495,7 +495,7 @@ public class PasswordStore extends AppCompatActivity { PasswordRepository.closeRepository(); new AlertDialog.Builder(this) - .setTitle("Repositiory location") + .setTitle("Repository location") .setMessage("Select where to create or clone your password repository.") .setPositiveButton("External", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton) { diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java index 8f8e8d66..7313ffb3 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.java +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.java @@ -8,6 +8,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; +import android.os.Environment; import android.preference.CheckBoxPreference; import android.preference.Preference; import android.preference.PreferenceFragment; @@ -29,6 +30,7 @@ import com.zeapo.pwdstore.git.GitActivity; import com.zeapo.pwdstore.utils.PasswordRepository; import net.rdrei.android.dirchooser.DirectoryChooserActivity; +import net.rdrei.android.dirchooser.DirectoryChooserConfig; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; @@ -124,7 +126,8 @@ public class UserPreference extends AppCompatActivity { public boolean onPreferenceClick(Preference preference) { new AlertDialog.Builder(callingActivity). setTitle(R.string.pref_dialog_delete_title). - setMessage(R.string.pref_dialog_delete_msg). + setMessage(getResources().getString(R.string.dialog_delete_msg) + + " " + PasswordRepository.getWorkTree().toString()). setCancelable(false). setPositiveButton(R.string.dialog_delete, new DialogInterface.OnClickListener() { @Override @@ -265,8 +268,16 @@ public class UserPreference extends AppCompatActivity { public void selectExternalGitRepository() { Intent intent = new Intent(this, DirectoryChooserActivity.class); - intent.putExtra(DirectoryChooserActivity.EXTRA_NEW_DIR_NAME, - "passwordstore"); + File dir = new File(Environment.getExternalStorageDirectory() + "/PasswordStore"); + if (!dir.exists()) { + dir.mkdir(); + } + DirectoryChooserConfig config = DirectoryChooserConfig.builder() + .newDirectoryName("PasswordStore") + .allowNewDirectoryNameModification(true) + .initialDirectory(Environment.getExternalStorageDirectory() + "/PasswordStore") + .build(); + intent.putExtra(DirectoryChooserActivity.EXTRA_CONFIG, config); startActivityForResult(intent, SELECT_GIT_DIRECTORY); } diff --git a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java b/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java index 00d5be35..d5cba03e 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/GitActivity.java @@ -481,7 +481,7 @@ public class GitActivity extends AppCompatActivity { if (localDir.exists() && localDir.listFiles().length != 0) { new AlertDialog.Builder(this). setTitle(R.string.dialog_delete_title). - setMessage(R.string.dialog_delete_msg). + setMessage(getResources().getString(R.string.dialog_delete_msg) + " " + localDir.toString()). setCancelable(false). setPositiveButton(R.string.dialog_delete, new DialogInterface.OnClickListener() { |