adjusted orbot support and moved on to 0.7.2

README.md

@@ -36,6 +36,7 @@ NewPipe does not use any Google framework libraries, or the YouTube API. It only
 * Open a video in Kodi
 * Show Next/Related videos
 * Search YouTube in a specific language
+* Orbot/Tor support (no streaming yet)
 
 ### Coming Features
 

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 10
+        versionCode 11
-        versionName "0.7.1"
+        versionName "0.7.2"
     }
     buildTypes {
         release {

app/src/main/java/org/schabi/newpipe/App.java

@@ -15,10 +15,13 @@ 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));
+        if(prefs.getBoolean(getString(R.string.useTorKey), false)) {
+            OrbotHelper.requestStartTor(this);
+            configureTor(true);
+        } else {
+            configureTor(false);
         }
     }
 

app/src/main/java/org/schabi/newpipe/Downloader.java

@@ -1,23 +1,23 @@
 package org.schabi.newpipe;
 
-import android.app.Notification;
+
 import android.app.NotificationManager;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
+import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.UnknownHostException;
 
@@ -47,7 +47,6 @@ import info.guardianproject.netcipher.NetCipher;
 
 public class Downloader {
     public static final String TAG = "Downloader";
-
     private static final String USER_AGENT = "Mozilla/5.0";
 
     /**Download the text file at the supplied URL as in download(String),
@@ -59,7 +58,7 @@ public class Downloader {
         String ret = "";
         try {
             URL url = new URL(siteUrl);
-            HttpsURLConnection con = NetCipher.getHttpsURLConnection(url);
+            HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
             con.setRequestProperty("Accept-Language", language);
             ret = dl(con);
         }
@@ -68,8 +67,9 @@ public class Downloader {
         }
         return ret;
     }
+
     /**Common functionality between download(String url) and download(String url, String language)*/
-    private static String dl(HttpURLConnection con) throws IOException {
+    private static String dl(HttpsURLConnection con) throws IOException {
         StringBuilder response = new StringBuilder();
 
         try {

app/src/main/java/org/schabi/newpipe/SettingsActivity.java

@@ -109,33 +109,24 @@ public class SettingsActivity extends PreferenceActivity  {
                     (EditTextPreference) findPreference(DOWNLOAD_PATH_PREFERENCE);
             useTorCheckBox = (CheckBoxPreference) findPreference(USE_TOR_KEY);
 
-            // if Orbot is installed, then default to using Tor, the user can still override
-            final boolean useTor = OrbotHelper.isOrbotInstalled(activity);
-            useTorCheckBox.setDefaultValue(useTor);
-            useTorCheckBox.setChecked(useTor);
-            useTorCheckBox.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object o) {
-                    boolean useTor = (Boolean) o;
-                    if (useTor) {
-                        if (OrbotHelper.isOrbotInstalled(activity)) {
-                            App.configureTor(true);
-                        } else {
-                            Intent intent = OrbotHelper.getOrbotInstallIntent(activity);
-                            activity.startActivityForResult(intent, REQUEST_INSTALL_ORBOT);
-                        }
-                    } else {
-                        App.configureTor(false);
-                    }
-                    return true;
-                }
-            });
-
             prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
                 @Override
                 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
                                                       String key) {
+                    Activity a = getActivity();
                     updateSummary();
+
+                    if (defaultPreferences.getBoolean(USE_TOR_KEY, false)) {
+                        if (OrbotHelper.isOrbotInstalled(a)) {
+                            App.configureTor(true);
+                            OrbotHelper.requestStartTor(a);
+                        } else {
+                            Intent intent = OrbotHelper.getOrbotInstallIntent(a);
+                            a.startActivityForResult(intent, REQUEST_INSTALL_ORBOT);
+                        }
+                    } else {
+                        App.configureTor(false);
+                    }
                 }
             };
             defaultPreferences.registerOnSharedPreferenceChangeListener(prefListener);

app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java

@@ -107,6 +107,7 @@ public abstract class VideoExtractor {
     }
 
 
+    //todo: add licence field
     protected abstract int getErrorCode();
     protected abstract String getErrorMessage();
     protected abstract String getVideoUrl(String videoId);

app/src/main/res/xml/settings_screen.xml

@@ -75,7 +75,8 @@
         <CheckBoxPreference
             android:key="@string/useTorKey"
             android:title="@string/useTor"
-            android:summary="@string/useTorSummary" />
+            android:summary="@string/useTorSummary"
+            android:defaultValue="false"/>
 
     </PreferenceCategory>
 </PreferenceScreen>