From f9b46a0bf6537b4fc04f43039a229099a3abf7bb Mon Sep 17 00:00:00 2001
From: Gregor Santner <gdev@live.de>
Date: Sat, 22 Oct 2016 20:15:31 +0200
Subject: [PATCH] Merge master

---
 .../com/github/dfa/diaspora_android/ui/PodSelectionDialog.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
index 65cae8cb..c3b6fa5e 100644
--- a/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java
@@ -170,7 +170,6 @@ public class PodSelectionDialog extends AppCompatDialogFragment {
             if(pod.getPodUrl().getHost().endsWith(".onion") && checkboxTorPreset.isChecked()){
                 AppSettings settings = app.getSettings();
                 settings.setProxyHttpEnabled(true);
-                settings.setProxyWasEnabled(false);
                 settings.setProxyHttpPort(8118);
                 settings.setProxyHttpHost("127.0.0.1");
                 ProxyHandler.getInstance().updateProxySettings(getContext());