From 6fc9007cf96b1f0cf48996d0b9b4009be173bab4 Mon Sep 17 00:00:00 2001
From: Audrius Butkevicius <audrius.butkevicius@gmail.com>
Date: Mon, 28 Nov 2016 23:53:45 +0000
Subject: [PATCH] Add checkbox for hashing fallback (ref #778)

---
 .../nutomic/syncthingandroid/service/SyncthingRunnable.java  | 3 +++
 src/main/res/values/strings.xml                              | 4 ++++
 src/main/res/xml/app_settings.xml                            | 5 +++++
 3 files changed, 12 insertions(+)

diff --git a/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
index e22862f9..659c0645 100644
--- a/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
+++ b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
@@ -133,6 +133,9 @@ public class SyncthingRunnable implements Runnable {
                 env.put("all_proxy", "socks5://localhost:9050");
                 env.put("ALL_PROXY_NO_FALLBACK", "1");
             }
+            if (sp.getBoolean("use_legacy_hashing", false))
+                env.put("STHASHING", "standard");
+
             process = pb.start();
             mSyncthing.set(process);
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 32bc1391..dc5259ac 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -306,6 +306,10 @@ Please report any problems you encounter via Github.</string>
 
     <string name="use_tor_summary">Force all traffic through Tor for increased privacy. Requires Orbot</string>
 
+    <string name="use_legacy_hashing_title">Use legacy hashing</string>
+
+    <string name="use_legacy_hashing_summary">Force syncthing to use legacy hashing package for compatibility purposes</string>
+
     <!-- Dialog shown before config export -->
     <string name="dialog_confirm_export">Do you really want to export your configuration? Existing files will be overwritten.\n\nWARNING! Other applications may be able to read the private key from the backup location and use it to download/modify synchronized files.</string>
 
diff --git a/src/main/res/xml/app_settings.xml b/src/main/res/xml/app_settings.xml
index 858de9a9..2b180174 100644
--- a/src/main/res/xml/app_settings.xml
+++ b/src/main/res/xml/app_settings.xml
@@ -188,6 +188,11 @@
             android:title="@string/use_tor_title"
             android:summary="@string/use_tor_summary" />
 
+        <CheckBoxPreference
+            android:key="use_legacy_hashing"
+            android:title="@string/use_legacy_hashing_title"
+            android:summary="@string/use_legacy_hashing_summary" />
+
     </PreferenceScreen>
 
     <PreferenceScreen