From 5c492c01a174a0e509cceebc1312a0c9a6272095 Mon Sep 17 00:00:00 2001 From: Christian Schabesberger Date: Mon, 4 Jan 2016 00:10:51 +0100 Subject: [PATCH] adjusted orbot support and moved on to 0.7.2 --- README.md | 1 + app/build.gradle | 4 +-- app/src/main/java/org/schabi/newpipe/App.java | 11 +++--- .../java/org/schabi/newpipe/Downloader.java | 12 +++---- .../org/schabi/newpipe/SettingsActivity.java | 35 +++++++------------ .../newpipe/services/VideoExtractor.java | 1 + app/src/main/res/xml/settings_screen.xml | 3 +- 7 files changed, 32 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index e6d1d9498..b24ed14af 100644 --- a/README.md +++ b/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 diff --git a/app/build.gradle b/app/build.gradle index 9eb3ccef7..5eaf3a6c4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "org.schabi.newpipe" minSdkVersion 15 targetSdkVersion 23 - versionCode 10 - versionName "0.7.1" + versionCode 11 + versionName "0.7.2" } buildTypes { release { diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java index 877000e61..debb1a2a5 100644 --- a/app/src/main/java/org/schabi/newpipe/App.java +++ b/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)); + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + if(prefs.getBoolean(getString(R.string.useTorKey), false)) { + OrbotHelper.requestStartTor(this); + configureTor(true); + } else { + configureTor(false); } } diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java index 8a296c61e..cbc4c26c2 100644 --- a/app/src/main/java/org/schabi/newpipe/Downloader.java +++ b/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 { diff --git a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/SettingsActivity.java index bfc2a158c..3f747c2da 100644 --- a/app/src/main/java/org/schabi/newpipe/SettingsActivity.java +++ b/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); diff --git a/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java b/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java index 9da25fc92..e9735b32e 100644 --- a/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java +++ b/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); diff --git a/app/src/main/res/xml/settings_screen.xml b/app/src/main/res/xml/settings_screen.xml index f4de87d49..46ad3ecb9 100644 --- a/app/src/main/res/xml/settings_screen.xml +++ b/app/src/main/res/xml/settings_screen.xml @@ -75,7 +75,8 @@ + android:summary="@string/useTorSummary" + android:defaultValue="false"/>