From d3879a03982f3e8da4831704fb0ef280b884405f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 1 Jan 2016 22:16:41 +0100
Subject: [PATCH] setup Tor at app start, and config immediately when pref is
 changed

This adds an Application subclass to get the onCreate() method, which is
called once at the first start up of the app, before any Activity starts.
Tor is configured there to ensure it is setup before anything happens.

This also moves the "Use Tor" pref listener to a more appropriate place.
---
 app/src/main/AndroidManifest.xml              |  1 +
 app/src/main/java/org/schabi/newpipe/App.java | 32 +++++++++++++++++++
 .../java/org/schabi/newpipe/Downloader.java   |  2 --
 .../org/schabi/newpipe/PlayVideoActivity.java | 26 +--------------
 .../org/schabi/newpipe/SettingsActivity.java  | 19 +++++++++++
 app/src/main/res/xml/settings_screen.xml      |  3 +-
 6 files changed, 54 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/App.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d028886b1..ef84c57b3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:logo="@mipmap/ic_launcher"
diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
new file mode 100644
index 000000000..a8afccd4a
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -0,0 +1,32 @@
+package org.schabi.newpipe;
+
+import android.app.Application;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+import info.guardianproject.netcipher.NetCipher;
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
+public class App extends Application {
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // if Orbot is installed, then default to using Tor, the user can still override
+        if (OrbotHelper.requestStartTor(this)) {
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+            configureTor(prefs.getBoolean(getString(R.string.useTor), true));
+        }
+    }
+
+    /**
+     * Set the proxy settings based on whether Tor should be enabled or not.
+     */
+    static void configureTor(boolean useTor) {
+        if (useTor) {
+            NetCipher.useTor();
+        } else {
+            NetCipher.setProxy(null);
+        }
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java
index 9e33ce322..f0fe75582 100644
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -41,7 +41,6 @@ public class Downloader {
      * @param language the language (usually a 2-character code) to set as the preferred language
      * @return the contents of the specified text file*/
     public static String download(String siteUrl, String language) {
-        NetCipher.useTor();
         String ret = "";
         try {
             URL url = new URL(siteUrl);
@@ -86,7 +85,6 @@ public class Downloader {
  * @return the contents of the specified text file*/
     public static String download(String siteUrl) {
         String ret = "";
-        NetCipher.useTor();
 
         try {
             URL url = new URL(siteUrl);
diff --git a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
index f5e595624..2500c7dfe 100644
--- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
@@ -3,7 +3,6 @@ package org.schabi.newpipe;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.media.MediaPlayer;
@@ -26,8 +25,6 @@ import android.widget.Button;
 import android.widget.MediaController;
 import android.widget.ProgressBar;
 import android.widget.VideoView;
-import info.guardianproject.netcipher.NetCipher;
-import info.guardianproject.netcipher.proxy.OrbotHelper;
 
 /**
  * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@@ -47,7 +44,7 @@ import info.guardianproject.netcipher.proxy.OrbotHelper;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class PlayVideoActivity extends AppCompatActivity implements OnSharedPreferenceChangeListener {
+public class PlayVideoActivity extends AppCompatActivity {
 
     //// TODO: 11.09.15 add "choose stream" menu 
     
@@ -173,9 +170,6 @@ public class PlayVideoActivity extends AppCompatActivity implements OnSharedPref
         if(prefs.getBoolean(PREF_IS_LANDSCAPE, false) && !isLandscape) {
             toggleOrientation();
         }
-
-        setTorPreference(prefs);
-        prefs.registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
@@ -197,7 +191,6 @@ public class PlayVideoActivity extends AppCompatActivity implements OnSharedPref
     protected void onDestroy() {
         super.onDestroy();
         prefs = getPreferences(Context.MODE_PRIVATE);
-        prefs.unregisterOnSharedPreferenceChangeListener(this);
     }
 
     @Override
@@ -361,21 +354,4 @@ public class PlayVideoActivity extends AppCompatActivity implements OnSharedPref
         editor.putBoolean(PREF_IS_LANDSCAPE, isLandscape);
         editor.apply();
     }
-
-    private void setTorPreference(SharedPreferences prefs) {
-        // if Orbot is installed, then default to using Tor, the user can still override
-        if(prefs.getBoolean(getString(R.string.useTor), OrbotHelper.isOrbotInstalled(this))) {
-            NetCipher.useTor();
-        } else {
-            NetCipher.setProxy(null);
-        }
-    }
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
-        if(key.equals(getString(R.string.useTor))) {
-            setTorPreference(prefs);
-        }
-    }
-
 }
diff --git a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
index c8a548ab6..c8c089a98 100644
--- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java
@@ -2,6 +2,8 @@ package org.schabi.newpipe;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.support.annotation.LayoutRes;
@@ -13,6 +15,8 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import info.guardianproject.netcipher.proxy.OrbotHelper;
+
 /**
  * Created by Christian Schabesberger on 31.08.15.
  *
@@ -52,10 +56,25 @@ public class SettingsActivity extends PreferenceActivity {
     }
 
     public static class SettingsFragment extends PreferenceFragment {
+        private CheckBoxPreference useTorCheckBox;
+
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
             addPreferencesFromResource(R.xml.settings_screen);
+
+            // if Orbot is installed, then default to using Tor, the user can still override
+            useTorCheckBox = (CheckBoxPreference) findPreference(getString(R.string.useTor));
+            boolean useTor = OrbotHelper.isOrbotInstalled(getActivity());
+            useTorCheckBox.setDefaultValue(useTor);
+            useTorCheckBox.setChecked(useTor);
+            useTorCheckBox.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object useTor) {
+                    App.configureTor((Boolean) useTor);
+                    return true;
+                }
+            });
         }
     }
 
diff --git a/app/src/main/res/xml/settings_screen.xml b/app/src/main/res/xml/settings_screen.xml
index f7ab99a53..4d21b457b 100644
--- a/app/src/main/res/xml/settings_screen.xml
+++ b/app/src/main/res/xml/settings_screen.xml
@@ -75,8 +75,7 @@
         <CheckBoxPreference
             android:key="@string/useTor"
             android:title="@string/useTor"
-            android:summary="@string/useTorSummary"
-            android:defaultValue="false"/>
+            android:summary="@string/useTorSummary" />
 
     </PreferenceCategory>
 </PreferenceScreen>