From 5663e543a47eb90af320e5ebb09fcd2b8243c36d Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 1 Jan 2016 23:04:29 +0100
Subject: [PATCH] whenever an Activity resumes and tor is enabled, request it
 start

This makes sure that Orbot is running when the user expects it to be. If
NewPipe is configured to use Tor, then going to a NewPipe screen should
ensure Tor is running.
---
 app/src/main/java/org/schabi/newpipe/App.java        | 12 +++++++++++-
 .../java/org/schabi/newpipe/PlayVideoActivity.java   |  6 ++++++
 .../org/schabi/newpipe/VideoItemDetailActivity.java  |  6 ++++++
 .../org/schabi/newpipe/VideoItemListActivity.java    |  6 ++++++
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
index a8afccd4a..95127d7fe 100644
--- a/app/src/main/java/org/schabi/newpipe/App.java
+++ b/app/src/main/java/org/schabi/newpipe/App.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe;
 
 import android.app.Application;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
@@ -9,6 +10,8 @@ import info.guardianproject.netcipher.proxy.OrbotHelper;
 
 public class App extends Application {
 
+    private static boolean useTor;
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -22,11 +25,18 @@ public class App extends Application {
     /**
      * Set the proxy settings based on whether Tor should be enabled or not.
      */
-    static void configureTor(boolean useTor) {
+    static void configureTor(boolean enabled) {
+        useTor = enabled;
         if (useTor) {
             NetCipher.useTor();
         } else {
             NetCipher.setProxy(null);
         }
     }
+
+    static void checkStartTor(Context context) {
+        if (useTor) {
+            OrbotHelper.requestStartTor(context);
+        }
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
index 2500c7dfe..13a1cefed 100644
--- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
@@ -187,6 +187,12 @@ public class PlayVideoActivity extends AppCompatActivity {
         videoView.pause();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
index 4a553241f..f93ca4b9e 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
@@ -113,6 +113,12 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                 .commit();
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putString(VideoItemDetailFragment.VIDEO_URL, videoUrl);
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
index d15709b23..8c4f5c57e 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -175,6 +175,12 @@ public class VideoItemListActivity extends AppCompatActivity
         PreferenceManager.setDefaultValues(this, R.xml.settings_screen, false);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        App.checkStartTor(this);
+    }
+
     /**
      * Callback method from {@link VideoItemListFragment.Callbacks}
      * indicating that the item with the given ID was selected.