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

resolved merge conflict

Browse source
This commit is contained in:
Christian Schabesberger 2016-01-05 21:50:25 +01:00
commit c8d94f541f
43 changed files with 882 additions and 855 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/App.java
View file

@ -35,7 +35,7 @@ public class App extends Application {
super.onCreate();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
if(prefs.getBoolean(getString(R.string.useTorKey), false)) {
if(prefs.getBoolean(getString(R.string.use_tor_key), false)) {
OrbotHelper.requestStartTor(this);
configureTor(true);
} else {