1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 11:21:29 +00:00

Merge pull request #792 from AudriusButkevicius/legacy

Add checkbox for hashing fallback (ref #778)
This commit is contained in:
Felix Ableitner 2016-11-29 11:04:28 +09:00 committed by GitHub
commit 7b192d7df2
3 changed files with 12 additions and 0 deletions

View file

@ -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);

View file

@ -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>

View file

@ -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