summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorMohamed Zenadi <mohamed@zenadi.com>2017-06-24 12:24:28 +0200
committerMohamed Zenadi <mohamed@zenadi.com>2017-06-24 12:24:28 +0200
commit7b8ad7ca0f575113359bacadf151303f5b4c53a4 (patch)
tree14cc8b5c87a2aaa13064dad19b2c217ebc42ef4d /app/src/main/res
parentfca7f8267b2602f3d4b7b671278cad181f64eb63 (diff)
revert auto-sync and background git activity
too buggy, no time to work on it correclty
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/activity_pwdstore.xml3
-rw-r--r--app/src/main/res/values/strings.xml2
-rw-r--r--app/src/main/res/xml/preference.xml4
3 files changed, 1 insertions, 8 deletions
diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml
index 1b7ccac6..84c7af06 100644
--- a/app/src/main/res/layout/activity_pwdstore.xml
+++ b/app/src/main/res/layout/activity_pwdstore.xml
@@ -3,8 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".pwdstore"
- android:orientation="vertical"
- android:id="@+id/main_activity">
+ android:orientation="vertical">
<LinearLayout
android:id="@+id/main_layout"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 175a20c6..5823c016 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -197,6 +197,4 @@
<string name="no_repo_selected2">No external repository selected</string>
<string name="send_plaintext_password_to">Send password as plaintext using…</string>
<string name="show_password">Show password</string>
- <string name="git_auto_sync_title">Auto Sync on start</string>
- <string name="git_auto_sync_summary">Synchronize the repository when starting the application or when resuming.</string>
</resources>
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index f7833ee5..250370e7 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -16,10 +16,6 @@
<Preference
android:key="ssh_see_key"
android:title="@string/pref_ssh_see_key_title" />
- <CheckBoxPreference
- android:key="git_auto_sync"
- android:summary="@string/git_auto_sync_summary"
- android:title="@string/git_auto_sync_title" />
<Preference
android:key="git_delete_repo"
android:summary="@string/pref_git_delete_repo_summary"