Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test tor code

Browse source
This commit is contained in:
GDR! 2015-12-24 14:55:33 +01:00 • committed by Hans-Christoph Steiner
parent eeb612f9a2
commit ef255d12ae
5 changed files with 44 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/org/schabi/newpipe/Downloader.java
View file

@ -7,6 +7,8 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.net.UnknownHostException;
import info.guardianproject.netcipher.NetCipher;
/**
* Created by Christian Schabesberger on 14.08.15.
*
@ -37,10 +39,11 @@ 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);
HttpURLConnection con = (HttpURLConnection) url.openConnection();
HttpURLConnection con = (HttpURLConnection) NetCipher.getHttpURLConnection(url);
con.setRequestProperty("Accept-Language", language);
ret = dl(con);
}
@ -81,10 +84,11 @@ 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);
HttpURLConnection con = (HttpURLConnection) url.openConnection();
HttpURLConnection con = (HttpURLConnection) NetCipher.getHttpURLConnection(url);
ret = dl(con);
}
catch(Exception e) {

30
app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
View file

@ -3,6 +3,7 @@ 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;
@ -25,6 +26,7 @@ import android.widget.Button;
import android.widget.MediaController;
import android.widget.ProgressBar;
import android.widget.VideoView;
import info.guardianproject.netcipher.NetCipher;
/**
* Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
@ -44,7 +46,7 @@ import android.widget.VideoView;
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
*/
public class PlayVideoActivity extends AppCompatActivity {
public class PlayVideoActivity extends AppCompatActivity implements OnSharedPreferenceChangeListener {
//// TODO: 11.09.15 add "choose stream" menu
@ -170,6 +172,9 @@ public class PlayVideoActivity extends AppCompatActivity {
if(prefs.getBoolean(PREF_IS_LANDSCAPE, false) && !isLandscape) {
toggleOrientation();
}
setTorPreference(prefs);
prefs.registerOnSharedPreferenceChangeListener(this);
}
@Override
@ -187,6 +192,13 @@ public class PlayVideoActivity extends AppCompatActivity {
videoView.pause();
}
@Override
protected void onDestroy() {
super.onDestroy();
prefs = getPreferences(Context.MODE_PRIVATE);
prefs.unregisterOnSharedPreferenceChangeListener(this);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
@ -348,4 +360,20 @@ public class PlayVideoActivity extends AppCompatActivity {
editor.putBoolean(PREF_IS_LANDSCAPE, isLandscape);
editor.apply();
}
private void setTorPreference(SharedPreferences prefs) {
if(prefs.getBoolean(getString(R.string.useTor), false)) {
NetCipher.useTor();
} else {
NetCipher.setProxy(null);
}
}
@Override
public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
if(key.equals(getString(R.string.useTor))) {
setTorPreference(prefs);
}
}
}