October 2016 - tor-commits - lists.torproject.org

[orbot/master] improve the code for launching the pdnsd daemon
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 330860216a27897aa4c1dd943ea8375af78f889a Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Oct 12 16:46:53 2016 -0400 improve the code for launching the pdnsd daemon --- .../android/service/vpn/OrbotVpnManager.java | 37 +++++++++++----------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 5830a85..1b4cca0 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -41,10 +41,13 @@ import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.transproxy.TorifiedApp; import org.torproject.android.service.util.TorServiceUtils; +import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.io.PrintStream; import java.net.InetAddress; import java.util.ArrayList; @@ -405,13 +408,25 @@ public class OrbotVpnManager implements Handler.Callback { ArrayList<String> customEnv = new ArrayList<String>(); String baseDirectory = filePdnsd.getParent(); - String cmdString = "sh " + filePdnsd.getCanonicalPath() + - " -c " + baseDirectory + "/pdnsd.conf"; - - Process proc = Runtime.getRuntime().exec(cmdString); + String[] cmdString = {filePdnsd.getCanonicalPath(),"-c",baseDirectory + "/pdnsd.conf"}; + ProcessBuilder pb = new ProcessBuilder(cmdString); + pb.redirectErrorStream(true); + Process proc = pb.start(); try { proc.waitFor();} catch (Exception e){} Log.i(TAG,"PDNSD: " + proc.exitValue()); + + if (proc.exitValue() != 0) + { + BufferedReader br = new BufferedReader(new InputStreamReader(proc.getInputStream())); + + String line = null; + while ((line = br.readLine ()) != null) { + Log.d(TAG,"pdnsd: " + line); + } + + } + } @@ -428,20 +443,6 @@ public class OrbotVpnManager implements Handler.Callback { PrintStream ps = new PrintStream(fos); ps.print(conf); ps.close(); - - //f.withWriter { out -> out.print conf }; - - /** - * - - server { - label= "upstream"; - ip = %s; - port = %d; - uptest = none; - } - */ - File cache = new File(fileDir,"pdnsd.cache");

1 0

[orbot/master] using compat builder for notifications
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 9de4f54e6be978580bdc175d2c7fd599056a4760 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Oct 12 16:58:56 2016 -0400 using compat builder for notifications --- .../src/main/java/org/torproject/android/service/TorService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index fc06e2e..dbc6f81 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -28,6 +28,7 @@ import android.net.NetworkInfo; import android.os.Build; import android.os.IBinder; import android.os.RemoteException; +import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; @@ -102,7 +103,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private int mNetworkType = -1; private NotificationManager mNotificationManager = null; - private Notification.Builder mNotifyBuilder; + private NotificationCompat.Builder mNotifyBuilder; private Notification mNotification; private boolean mNotificationShowing = false; @@ -203,7 +204,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mNotifyBuilder == null) { - mNotifyBuilder = new Notification.Builder(this) + mNotifyBuilder = new NotificationCompat.Builder(this) .setContentTitle(getString(R.string.app_name)) .setSmallIcon(R.drawable.ic_stat_tor);

1 0

[orbot/master] add the proguard rules
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 3c181bc6f26adc6a9421b0f8e55563ea93ea5bf1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Oct 13 15:31:53 2016 -0400 add the proguard rules --- orbotservice/proguard-rules.pro | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/orbotservice/proguard-rules.pro b/orbotservice/proguard-rules.pro new file mode 100644 index 0000000..48384c8 --- /dev/null +++ b/orbotservice/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /home/n8fr8/dev/android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#}

1 0

[orbot/master] make sure we set VPN mode properly before we launch the service
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 50f33c9ca2d58b741ae40fbdeec42786240117fd Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Oct 13 15:31:12 2016 -0400 make sure we set VPN mode properly before we launch the service --- app/src/main/AndroidManifest.xml | 2 +- .../main/java/org/torproject/android/OrbotMainActivity.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2570737..73a90cf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionCode="15200001" android:installLocation="auto" > - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/> + <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/> <!-- <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 8b9cb5b..5e57c2c 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -299,6 +299,9 @@ public class OrbotMainActivity extends AppCompatActivity @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + + Prefs.putUseVpn(isChecked); + if (isChecked) startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); else @@ -828,9 +831,15 @@ public class OrbotMainActivity extends AppCompatActivity } } - else if (request == REQUEST_VPN && response == RESULT_OK) + else if (request == REQUEST_VPN) { - sendIntentToService(TorServiceConstants.CMD_VPN); + if (response == RESULT_OK) + sendIntentToService(TorServiceConstants.CMD_VPN); + else + { + Prefs.putUseVpn(false); + + } } IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data);

1 0

[orbot/master] we aren't going to show a notification light
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 9948975d4fdb1e39c6fc887bb1edb71d92710c28 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Oct 13 15:31:34 2016 -0400 we aren't going to show a notification light --- .../src/main/java/org/torproject/android/service/TorService.java | 1 - 1 file changed, 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index dbc6f81..5cd3e75 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -219,7 +219,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (notifyType != NOTIFY_ID) { mNotifyBuilder.setTicker(notifyMsg); - // mNotifyBuilder.setLights(Color.GREEN, 1000, 1000); } else {

1 0

[orbot/master] remove vpn code that is now in the service module
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit d5f2c063b53ff0392f5972ecb1976c097c0f3933 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Sep 29 12:00:40 2016 -0400 remove vpn code that is now in the service module --- .../main/java/org/torproject/android/OrbotApp.java | 17 ----------- app/src/main/res/values/pdnsd.xml | 33 ---------------------- 2 files changed, 50 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java index 3b1593f..cbf118b 100644 --- a/app/src/main/java/org/torproject/android/OrbotApp.java +++ b/app/src/main/java/org/torproject/android/OrbotApp.java @@ -22,8 +22,6 @@ public class OrbotApp extends Application implements OrbotConstants private Locale locale; - private OrbotVpnManager mVpnManager = null; - @Override public void onCreate() { super.onCreate(); @@ -35,21 +33,6 @@ public class OrbotApp extends Application implements OrbotConstants } - @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) - public boolean startVPN (VpnService service, int port) - { - - mVpnManager = new OrbotVpnManager(service); - - Intent intent = new Intent(); - intent.setAction("start"); - intent.putExtra("torSocks", port); - - // mVpnManager.handleIntent(new VpnService.Builder(),intent); - - return true; - } - @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); diff --git a/app/src/main/res/values/pdnsd.xml b/app/src/main/res/values/pdnsd.xml deleted file mode 100644 index 522f765..0000000 --- a/app/src/main/res/values/pdnsd.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="pdnsd_conf" formatted="false"> -global { - perm_cache=0; - cache_dir="/data/data/org.torproject.android/app_bin"; - server_port = 8091; - server_ip = 0.0.0.0; - query_method=udp_only; - min_ttl=15m; - max_ttl=1w; - timeout=10; - daemon=on; - pid_file="/data/data/org.torproject.android/app_bin/pdnsd.pid"; - -} - -server { - label= "upstream"; - ip = %s; - port = %d; - uptest = none; -} - -rr { - name=localhost; - reverse=on; - a=127.0.0.1; - owner=localhost; - soa=localhost,root.localhost,42,86400,900,86400,86400; -} - </string> -</resources>

1 0

[orbot/master] multiple fixes to re-enable VPN mode and pdnsd daemon
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit da0fb101f3b56588c2b92137fc770120eedb1cab Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Oct 12 16:01:09 2016 -0400 multiple fixes to re-enable VPN mode and pdnsd daemon --- .../org/torproject/android/OnBootReceiver.java | 5 +- .../org/torproject/android/OrbotMainActivity.java | 60 +++--- .../torproject/android/vpn/VPNEnableActivity.java | 1 - app/src/main/res/layout/layout_main.xml | 225 ++++++++++----------- external/Makefile | 2 +- .../org/torproject/android/service/TorService.java | 62 +++--- .../android/service/TorServiceConstants.java | 5 +- .../android/service/vpn/OrbotVpnManager.java | 19 +- orbotservice/src/main/jni/Application.mk | 3 +- orbotservice/src/main/res/values/pdnsd.xml | 6 +- 10 files changed, 195 insertions(+), 193 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/app/src/main/java/org/torproject/android/OnBootReceiver.java index 91d6beb..722f4f1 100644 --- a/app/src/main/java/org/torproject/android/OnBootReceiver.java +++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java @@ -16,10 +16,9 @@ public class OnBootReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - Prefs.setContext(context); - if (Prefs.startOnBoot() && (!sReceivedBoot)) - { + if (Prefs.startOnBoot() && (!sReceivedBoot)) + { if (Prefs.useVpn()) startVpnService(context); //VPN will start Tor once it is done else diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index c243c67..8b9cb5b 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -52,6 +52,7 @@ import android.support.v4.content.LocalBroadcastManager; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.SwitchCompat; import android.support.v7.widget.Toolbar; import android.util.AttributeSet; import android.util.Log; @@ -70,10 +71,10 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.CompoundButton; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; -import android.widget.ToggleButton; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; @@ -89,9 +90,9 @@ public class OrbotMainActivity extends AppCompatActivity private TextView uploadText = null; private TextView mTxtOrbotLog = null; - private Button mBtnBrowser = null; - private ToggleButton mBtnVPN = null; - private ToggleButton mBtnBridges = null; + // private Button mBtnBrowser = null; + private SwitchCompat mBtnVPN = null; + private SwitchCompat mBtnBridges = null; private Spinner spnCountries = null; @@ -257,7 +258,7 @@ public class OrbotMainActivity extends AppCompatActivity // Gesture detection mGestureDetector = new GestureDetector(this, new MyGestureDetector()); - + /** mBtnBrowser = (Button)findViewById(R.id.btnBrowser); mBtnBrowser.setOnClickListener(new View.OnClickListener () { @@ -271,8 +272,9 @@ public class OrbotMainActivity extends AppCompatActivity }); mBtnBrowser.setEnabled(false); - - mBtnVPN = (ToggleButton)findViewById(R.id.btnVPN); + */ + + mBtnVPN = (SwitchCompat)findViewById(R.id.btnVPN); boolean canDoVPN = Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH; @@ -292,24 +294,23 @@ public class OrbotMainActivity extends AppCompatActivity startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); } - mBtnVPN.setOnClickListener(new View.OnClickListener () - { - - @Override - public void onClick(View v) { - - if (mBtnVPN.isChecked()) - startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); - else - stopVpnService(); - - } - - }); + mBtnVPN.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() + { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) + { + if (isChecked) + startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); + else + stopVpnService(); + } + }); + + } - mBtnBridges = (ToggleButton)findViewById(R.id.btnBridges); + mBtnBridges = (SwitchCompat)findViewById(R.id.btnBridges); mBtnBridges.setChecked(Prefs.bridgesEnabled()); mBtnBridges.setOnClickListener(new View.OnClickListener () { @@ -323,7 +324,6 @@ public class OrbotMainActivity extends AppCompatActivity } else { - Toast.makeText(OrbotMainActivity.this, R.string.note_only_standard_tor_bridges_work_on_intel_x86_atom_devices, Toast.LENGTH_LONG).show(); showGetBridgePrompt(""); //if other chip ar, only stock bridges are supported } } @@ -1063,11 +1063,7 @@ public class OrbotMainActivity extends AppCompatActivity protected void onResume() { super.onResume(); - if (mPrefs != null) - { - mBtnVPN.setChecked(Prefs.useVpn()); - mBtnBridges.setChecked(Prefs.bridgesEnabled()); - } + mBtnBridges.setChecked(Prefs.bridgesEnabled()); requestTorStatus(); @@ -1124,7 +1120,7 @@ public class OrbotMainActivity extends AppCompatActivity imgStatus.setImageResource(R.drawable.toron); - mBtnBrowser.setEnabled(true); + //mBtnBrowser.setEnabled(true); if (torServiceMsg != null) { @@ -1170,7 +1166,7 @@ public class OrbotMainActivity extends AppCompatActivity else lblStatus.setText(getString(R.string.status_starting_up)); - mBtnBrowser.setEnabled(false); + // mBtnBrowser.setEnabled(false); } else if (torStatus == TorServiceConstants.STATUS_STOPPING) { @@ -1179,13 +1175,13 @@ public class OrbotMainActivity extends AppCompatActivity imgStatus.setImageResource(R.drawable.torstarting); lblStatus.setText(torServiceMsg); - mBtnBrowser.setEnabled(false); + // mBtnBrowser.setEnabled(false); } else if (torStatus == TorServiceConstants.STATUS_OFF) { imgStatus.setImageResource(R.drawable.toroff); lblStatus.setText(getString(R.string.press_to_start)); - mBtnBrowser.setEnabled(false); +// mBtnBrowser.setEnabled(false); } if (torServiceMsg != null && torServiceMsg.length() > 0) diff --git a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java index 6bbae30..9ed87d6 100644 --- a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java +++ b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java @@ -71,7 +71,6 @@ public class VPNEnableActivity extends Activity { @Override public void onClick(DialogInterface dialog, int which) { Prefs.putUseVpn(true); - startVpnService(); } diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index 35dddc4..b834135 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -30,92 +30,7 @@ android:layout_height="wrap_content" > - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - - > - - -  - - <RelativeLayout - android:id="@+id/rowTrafficDown" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingLeft="3sp" - android:paddingRight="3sp" - - > - <TextView - android:id="@+id/trafficLabelDown" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textSize="15sp" - android:text="@string/main_layout_download" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" /> - <TextView - android:id="@+id/trafficLabelUp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:text="@string/main_layout_upload" - android:textSize="15sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" /> - - </RelativeLayout> - <RelativeLayout - android:id="@+id/rowTrafficUp" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="3sp" - android:paddingRight="3sp" - android:paddingBottom="3sp" - - > - <TextView - android:id="@+id/trafficDown" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textSize="15sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - /> - - <TextView - android:id="@+id/trafficUp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:textSize="15sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - /> - </RelativeLayout> - </LinearLayout> - + <ProgressBar android:id="@+id/pbConnecting" @@ -138,10 +53,9 @@ android:layout_gravity="center_horizontal|center_vertical"/> <org.torproject.android.ui.ImageProgressView android:id="@+id/imgStatus" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight=".8" - - android:padding="0dp" + android:layout_height="275dp" + + android:padding="0dp" android:layout_margin="0dp" android:src="@drawable/toroff" /> @@ -154,20 +68,20 @@ android:layout_gravity="center_horizontal|center_vertical"/> android:fontFamily="sans-serif-light" android:text="" android:lines="2" - android:maxLines="2" + android:maxLines="2" android:layout_gravity="center_horizontal" android:layout_margin="0dp" - android:layout_marginLeft="5dp" + android:layout_marginLeft="5dp" android:layout_marginRight="5dp" /> <LinearLayout android:gravity="center_horizontal" android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - - android:layout_gravity="bottom" + > - + +  - <ToggleButton + <android.support.v7.widget.SwitchCompat android:id="@+id/btnVPN" - android:layout_width="wrap_content" + android:layout_width="100dp" android:layout_height="wrap_content" - android:textOff="@string/menu_vpn" - android:textOn="@string/menu_vpn" + android:text="@string/menu_vpn" android:layout_margin="3dp" android:ellipsize="end" android:singleLine="true" /> - <ToggleButton + <android.support.v7.widget.SwitchCompat android:id="@+id/btnBridges" - android:layout_width="wrap_content" + android:layout_width="100dp" android:layout_height="wrap_content" - android:textOff="@string/bridges" - android:textOn="@string/bridges" + android:text="@string/bridges" android:layout_marginTop="3dp" + android:layout_marginLeft="25dp" android:layout_marginBottom="3dp" android:ellipsize="end" android:singleLine="true" /> - <Spinner - android:id="@+id/spinnerCountry" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - /> - + </LinearLayout> </LinearLayout> - - </LinearLayout> + <Spinner + android:id="@+id/spinnerCountry" + android:layout_width="200dp" + android:layout_height="wrap_content" + android:layout_weight="1" + /> + + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="bottom" + android:padding="6dp" + > + + +  + + <RelativeLayout + android:id="@+id/rowTrafficDown" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingLeft="3sp" + android:paddingRight="3sp" + + > + <TextView + android:id="@+id/trafficLabelDown" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:textSize="15sp" + android:text="@string/main_layout_download" + android:gravity="center_vertical" + android:fontFamily="sans-serif-light" /> + <TextView + android:id="@+id/trafficLabelUp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:text="@string/main_layout_upload" + android:textSize="15sp" + android:gravity="center_vertical" + android:fontFamily="sans-serif-light" /> + + </RelativeLayout> + <RelativeLayout + android:id="@+id/rowTrafficUp" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingLeft="3sp" + android:paddingRight="3sp" + android:paddingBottom="3sp" + + > + <TextView + android:id="@+id/trafficDown" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:textSize="15sp" + android:gravity="center_vertical" + android:fontFamily="sans-serif-light" + /> + + <TextView + android:id="@+id/trafficUp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:textSize="15sp" + android:gravity="center_vertical" + android:fontFamily="sans-serif-light" + /> + </RelativeLayout> + </LinearLayout> </LinearLayout> <LinearLayout diff --git a/external/Makefile b/external/Makefile index 21c87a1..850e92c 100644 --- a/external/Makefile +++ b/external/Makefile @@ -314,7 +314,7 @@ assets: tor polipo iptables pluto -zip ../orbotservice/src/main/assets/$(APP_ABI)/xtables.mp3 bin/xtables -$(STRIP) bin/obfs4proxy -zip ../orbotservice/src/main/assets/$(APP_ABI)/obfs4proxy.mp3 bin/obfs4proxy - -$(STRIP) ../app/src/main/libs/$(APP_ABI)/pdnsd + -$(STRIP) ../orbotservice/src/main/libs/$(APP_ABI)/pdnsd -zip ../orbotservice/src/main/assets/$(APP_ABI)/pdnsd.mp3 ../orbotservice/src/main/libs/$(APP_ABI)/pdnsd -rm ../orbotservice/src/main/libs/$(APP_ABI)/pdnsd diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 2cff209..fc06e2e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -121,7 +121,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon public static File fileObfsclient; public static File fileXtables; public static File fileTorRc; - public static File filePdnsd; public void debug(String msg) @@ -227,8 +226,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } mNotifyBuilder.setOngoing(Prefs.persistNotifications()); - - mNotification = mNotifyBuilder.build(); + mNotifyBuilder.setPriority(Notification.PRIORITY_LOW); + mNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE); + + + mNotification = mNotifyBuilder.build(); if (Build.VERSION.SDK_INT >= 16 && Prefs.expandedNotifications()) { // Create remote view that needs to be set as bigContentView for the notification. @@ -531,7 +533,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon fileObfsclient = new File(appBinHome, TorServiceConstants.OBFSCLIENT_ASSET_KEY); fileXtables = new File(appBinHome, TorServiceConstants.IPTABLES_ASSET_KEY); fileTorRc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY); - filePdnsd = new File(appBinHome, TorServiceConstants.PDNSD_ASSET_KEY); mEventHandler = new TorEventHandler(this); @@ -726,7 +727,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon // these states should probably be handled better sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus); return; - } else if (mCurrentStatus == STATUS_ON && findExistingTorDaemon()) { + } else if (mCurrentStatus == STATUS_ON) { sendCallbackLogMessage("Ignoring start request, already started."); @@ -1444,7 +1445,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon @Override public void onReceive(Context context, Intent intent) { - if (mCurrentStatus != STATUS_ON) + if (mCurrentStatus == STATUS_OFF) return; SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); @@ -1484,39 +1485,36 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { logNotice(context.getString(R.string.no_network_connectivity_putting_tor_to_sleep_)); showToolbarNotification(getString(R.string.no_internet_connection_tor),NOTIFY_ID,R.drawable.ic_stat_tor_off); - + } else { logNotice(context.getString(R.string.network_connectivity_is_good_waking_tor_up_)); showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor); } - - //is this a change in state? - if (isChanged) - { - try { - - if (mCurrentStatus != STATUS_OFF) - { - if (mConnectivity) - { - if (Prefs.useRoot() && Prefs.useTransparentProxying() && Prefs.transProxyNetworkRefresh()) - { - - - disableTransparentProxy(); - enableTransparentProxy(); - - } - } - } - - } catch (Exception e) { - logException ("error updating state after network restart",e); - } + + try { + + if (mCurrentStatus != STATUS_OFF) + { + if (mConnectivity) + { + if (Prefs.useRoot() && Prefs.useTransparentProxying() && Prefs.transProxyNetworkRefresh()) + { + + + disableTransparentProxy(); + enableTransparentProxy(); + + } + } + } + + } catch (Exception e) { + logException ("error updating state after network restart",e); + } - } + } diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index e2f0964..f431b0c 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -133,9 +133,8 @@ public interface TorServiceConstants { public static final String CMD_UPDATE_TRANS_PROXY = "update"; public static final String CMD_SET_EXIT = "setexit"; - - - public static final String BINARY_TOR_VERSION = "0.2.7.5-020120160125"; + + public static final String BINARY_TOR_VERSION = "0.2.8.1-1"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index ae03881..5830a85 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -86,7 +86,9 @@ public class OrbotVpnManager implements Handler.Callback { public OrbotVpnManager (VpnService service) { mService = service; - filePdnsd = mService.getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE); + + File fileBinHome = mService.getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE); + filePdnsd = new File(fileBinHome,TorServiceConstants.PDNSD_ASSET_KEY); } @@ -428,8 +430,19 @@ public class OrbotVpnManager implements Handler.Callback { ps.close(); //f.withWriter { out -> out.print conf }; - - + + /** + * + + server { + label= "upstream"; + ip = %s; + port = %d; + uptest = none; + } + */ + + File cache = new File(fileDir,"pdnsd.cache"); if (!cache.exists()) { diff --git a/orbotservice/src/main/jni/Application.mk b/orbotservice/src/main/jni/Application.mk index 25058c1..a356ed7 100644 --- a/orbotservice/src/main/jni/Application.mk +++ b/orbotservice/src/main/jni/Application.mk @@ -1,5 +1,4 @@ -#APP_ABI := armeabi x86 APP_ABI := armeabi -APP_PLATFORM := android-14 +APP_PLATFORM := android-16 APP_STL := stlport_static NDK_TOOLCHAIN_VERSION := 4.8 diff --git a/orbotservice/src/main/res/values/pdnsd.xml b/orbotservice/src/main/res/values/pdnsd.xml index 522f765..a9ba34d 100644 --- a/orbotservice/src/main/res/values/pdnsd.xml +++ b/orbotservice/src/main/res/values/pdnsd.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="pdnsd_conf" formatted="false"> + <string name="pdnsd_conf" formatted="true"> global { perm_cache=0; cache_dir="/data/data/org.torproject.android/app_bin"; @@ -17,8 +17,8 @@ global { server { label= "upstream"; - ip = %s; - port = %d; + ip = %1$s; + port = %2$d; uptest = none; }

1 0

[orbot/master] Merge pull request #55 from n8fr8/dev_gradle
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 61affce706b7bffc5d562d6715cda51ae77354e9 Merge: 4023354 cd8b549 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Oct 13 15:33:32 2016 -0400 Merge pull request #55 from n8fr8/dev_gradle Dev gradle .gitignore | 60 +- AndroidManifest.xml | 8 +- BUILD | 34 +- app/build.gradle | 26 + app/src/main/AndroidManifest.xml | 135 + .../integration/android/IntentIntegrator.java | 506 + .../zxing/integration/android/IntentResult.java | 95 + .../org/torproject/android/OnBootReceiver.java | 50 + .../main/java/org/torproject/android/OrbotApp.java | 56 + .../org/torproject/android/OrbotMainActivity.java | 1452 +++ .../org/torproject/android/settings/Languages.java | 232 + .../android/settings/SettingsPreferences.java | 161 + .../java/org/torproject/android/ui/AppManager.java | 389 + .../torproject/android/ui/BridgeSetupActivity.java | 5 + .../torproject/android/ui/ImageProgressView.java | 78 + .../android/ui/OrbotDiagnosticsActivity.java | 328 + .../torproject/android/ui/PromoAppsActivity.java | 215 + .../torproject/android/ui/Rotate3dAnimation.java | 76 + .../torproject/android/ui/VPNSetupActivity.java | 5 + .../torproject/android/vpn/VPNEnableActivity.java | 162 + .../res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 480 bytes app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png | Bin 0 -> 802 bytes .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 0 -> 744 bytes .../res/drawable-hdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 967 bytes app/src/main/res/drawable-hdpi-v11/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 616 bytes app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png | Bin 0 -> 713 bytes app/src/main/res/drawable-hdpi-v9/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-hdpi/ic_action_settings.png | Bin 0 -> 553 bytes app/src/main/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 4194 bytes .../main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 0 -> 1312 bytes app/src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 0 -> 852 bytes .../main/res/drawable-hdpi/ic_stat_tor_xfer.png | Bin 0 -> 990 bytes app/src/main/res/drawable-hdpi/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 0 -> 294 bytes app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png | Bin 0 -> 390 bytes app/src/main/res/drawable-ldpi-v11/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 0 -> 342 bytes app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png | Bin 0 -> 358 bytes app/src/main/res/drawable-ldpi-v9/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-ldpi/ic_action_settings.png | Bin 0 -> 319 bytes app/src/main/res/drawable-ldpi/ic_launcher.png | Bin 0 -> 2852 bytes .../main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 0 -> 647 bytes app/src/main/res/drawable-ldpi/ic_stat_tor.png | Bin 0 -> 606 bytes app/src/main/res/drawable-ldpi/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 357 bytes app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png | Bin 0 -> 517 bytes .../res/drawable-mdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 607 bytes app/src/main/res/drawable-mdpi-v11/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 458 bytes app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png | Bin 0 -> 475 bytes app/src/main/res/drawable-mdpi-v9/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-mdpi/ic_action_settings.png | Bin 0 -> 364 bytes app/src/main/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 2677 bytes .../main/res/drawable-mdpi/ic_stat_notifyerr.png | Bin 0 -> 883 bytes app/src/main/res/drawable-mdpi/ic_stat_tor.png | Bin 0 -> 535 bytes .../main/res/drawable-mdpi/ic_stat_tor_xfer.png | Bin 0 -> 600 bytes app/src/main/res/drawable-mdpi/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 618 bytes .../main/res/drawable-xhdpi-v11/ic_stat_tor.png | Bin 0 -> 1165 bytes .../res/drawable-xhdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 1337 bytes app/src/main/res/drawable-xhdpi-v11/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 747 bytes app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png | Bin 0 -> 970 bytes app/src/main/res/drawable-xhdpi-v9/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-xhdpi/ic_action_settings.png | Bin 0 -> 716 bytes app/src/main/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 5964 bytes .../main/res/drawable-xhdpi/ic_stat_notifyerr.png | Bin 0 -> 1796 bytes app/src/main/res/drawable-xhdpi/ic_stat_tor.png | Bin 0 -> 1161 bytes .../main/res/drawable-xhdpi/ic_stat_tor_xfer.png | Bin 0 -> 1378 bytes app/src/main/res/drawable-xhdpi/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-xxhdpi-v11/ic_stat_tor.png | Bin 0 -> 1903 bytes .../res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 2019 bytes app/src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 9556 bytes app/src/main/res/drawable-xxhdpi/ic_stat_tor.png | Bin 0 -> 1872 bytes .../main/res/drawable-xxhdpi/ic_stat_tor_xfer.png | Bin 0 -> 2216 bytes app/src/main/res/drawable-xxhdpi/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-xxxhdpi-v11/ic_stat_tor.png | Bin 0 -> 2661 bytes .../res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 3156 bytes app/src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin 0 -> 13297 bytes app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png | Bin 0 -> 2631 bytes .../main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png | Bin 0 -> 2859 bytes app/src/main/res/drawable-xxxhdpi/inverse.png | Bin 0 -> 1027 bytes app/src/main/res/drawable/button.xml | 37 + app/src/main/res/drawable/button_off.xml | 37 + app/src/main/res/drawable/button_on.xml | 35 + app/src/main/res/drawable/classyfabric.png | Bin 0 -> 8856 bytes app/src/main/res/drawable/error.png | Bin 0 -> 2922 bytes app/src/main/res/drawable/ic_chatsecure.png | Bin 0 -> 4013 bytes app/src/main/res/drawable/ic_duckduckgo.png | Bin 0 -> 5042 bytes app/src/main/res/drawable/ic_launcher.png | Bin 0 -> 6055 bytes app/src/main/res/drawable/ic_menu_about.png | Bin 0 -> 1771 bytes app/src/main/res/drawable/ic_menu_exit.png | Bin 0 -> 2693 bytes app/src/main/res/drawable/ic_menu_goto.png | Bin 0 -> 1636 bytes app/src/main/res/drawable/ic_play.png | Bin 0 -> 3560 bytes app/src/main/res/drawable/ic_stat_tor_off.png | Bin 0 -> 744 bytes app/src/main/res/drawable/ic_stat_tor_xfer.png | Bin 0 -> 600 bytes app/src/main/res/drawable/ic_twitter.png | Bin 0 -> 2797 bytes app/src/main/res/drawable/icon_martus.png | Bin 0 -> 6763 bytes app/src/main/res/drawable/icon_orfox.png | Bin 0 -> 7617 bytes app/src/main/res/drawable/icon_story_maker.png | Bin 0 -> 4290 bytes app/src/main/res/drawable/inverse.png | Bin 0 -> 1027 bytes app/src/main/res/drawable/n8fr8.jpg | Bin 0 -> 18062 bytes app/src/main/res/drawable/oldtoroff.png | Bin 0 -> 63700 bytes app/src/main/res/drawable/oldtoron.png | Bin 0 -> 121036 bytes app/src/main/res/drawable/oldtorstarting.png | Bin 0 -> 111753 bytes app/src/main/res/drawable/onion32.png | Bin 0 -> 1599 bytes app/src/main/res/drawable/tilebg.xml | 4 + app/src/main/res/drawable/toggle.xml | 8 + app/src/main/res/drawable/tor.png | Bin 0 -> 4766 bytes app/src/main/res/drawable/tor25.png | Bin 0 -> 2227 bytes app/src/main/res/drawable/toroff.png | Bin 0 -> 39556 bytes app/src/main/res/drawable/toron.png | Bin 0 -> 47022 bytes app/src/main/res/drawable/torstarting.png | Bin 0 -> 41700 bytes .../layout-v21/layout_notification_expanded.xml | 123 + app/src/main/res/layout/layout_about.xml | 120 + app/src/main/res/layout/layout_apps.xml | 74 + app/src/main/res/layout/layout_apps_item.xml | 17 + app/src/main/res/layout/layout_diag.xml | 14 + app/src/main/res/layout/layout_help.xml | 20 + app/src/main/res/layout/layout_log.xml | 52 + app/src/main/res/layout/layout_main.xml | 244 + .../res/layout/layout_notification_expanded.xml | 122 + app/src/main/res/layout/layout_promo_apps.xml | 115 + app/src/main/res/layout/layout_settings.xml | 29 + app/src/main/res/layout/layout_vpn_setup.xml | 34 + .../main/res/layout/scrollingtext_buttons_view.xml | 34 + app/src/main/res/menu/orbot_main.xml | 70 + app/src/main/res/menu/share_menu.xml | 7 + app/src/main/res/values-ach/strings.xml | 12 + app/src/main/res/values-ar/strings.xml | 262 + app/src/main/res/values-az/strings.xml | 297 + app/src/main/res/values-bg/strings.xml | 293 + app/src/main/res/values-bn-rBD/strings.xml | 40 + app/src/main/res/values-bn-rIN/strings.xml | 12 + app/src/main/res/values-bn/strings.xml | 12 + app/src/main/res/values-brx/strings.xml | 12 + app/src/main/res/values-bs/strings.xml | 18 + app/src/main/res/values-ca/strings.xml | 226 + app/src/main/res/values-cs-rCZ/strings.xml | 223 + app/src/main/res/values-cs/strings.xml | 74 + app/src/main/res/values-cy/strings.xml | 81 + app/src/main/res/values-da/strings.xml | 203 + app/src/main/res/values-de-rAT/strings.xml | 12 + app/src/main/res/values-de/strings.xml | 293 + app/src/main/res/values-el/strings.xml | 208 + app/src/main/res/values-en-rGB/strings.xml | 13 + app/src/main/res/values-eo/strings.xml | 146 + app/src/main/res/values-es-rAR/strings.xml | 69 + app/src/main/res/values-es/strings.xml | 294 + app/src/main/res/values-et/strings.xml | 210 + app/src/main/res/values-eu/strings.xml | 218 + app/src/main/res/values-fa/strings.xml | 292 + app/src/main/res/values-fi/strings.xml | 278 + app/src/main/res/values-fr-rFR/strings.xml | 293 + app/src/main/res/values-fr/strings.xml | 54 + app/src/main/res/values-gl/strings.xml | 209 + app/src/main/res/values-gu-rIN/strings.xml | 14 + app/src/main/res/values-gu/strings.xml | 17 + app/src/main/res/values-he/strings.xml | 233 + app/src/main/res/values-hi/strings.xml | 26 + app/src/main/res/values-hr-rHR/strings.xml | 30 + app/src/main/res/values-hr/strings.xml | 293 + app/src/main/res/values-hu/strings.xml | 293 + app/src/main/res/values-hy-rAM/strings.xml | 12 + app/src/main/res/values-ia/strings.xml | 30 + app/src/main/res/values-id/strings.xml | 284 + app/src/main/res/values-in-rID/strings.xml | 284 + app/src/main/res/values-in/strings.xml | 48 + app/src/main/res/values-is/strings.xml | 278 + app/src/main/res/values-it/strings.xml | 293 + app/src/main/res/values-iw/strings.xml | 233 + app/src/main/res/values-ja/strings.xml | 293 + app/src/main/res/values-kn-rIN/strings.xml | 12 + app/src/main/res/values-kn/strings.xml | 12 + app/src/main/res/values-ko/strings.xml | 214 + app/src/main/res/values-ky/strings.xml | 21 + app/src/main/res/values-lt-rLT/strings.xml | 12 + app/src/main/res/values-lt/strings.xml | 28 + app/src/main/res/values-lv/strings.xml | 278 + app/src/main/res/values-mk/strings.xml | 278 + app/src/main/res/values-ml/strings.xml | 12 + app/src/main/res/values-mn/strings.xml | 12 + app/src/main/res/values-mr-rIN/strings.xml | 12 + app/src/main/res/values-ms-rMY/strings.xml | 196 + app/src/main/res/values-ms/strings.xml | 200 + app/src/main/res/values-my/strings.xml | 30 + app/src/main/res/values-nb/strings.xml | 258 + app/src/main/res/values-nl/strings.xml | 292 + app/src/main/res/values-pa/strings.xml | 19 + app/src/main/res/values-pl/strings.xml | 293 + app/src/main/res/values-ps/strings.xml | 12 + app/src/main/res/values-pt-rBR/strings.xml | 285 + app/src/main/res/values-pt-rPT/strings.xml | 14 + app/src/main/res/values-pt/strings.xml | 181 + app/src/main/res/values-ro-rRO/strings.xml | 30 + app/src/main/res/values-ro/strings.xml | 231 + app/src/main/res/values-rs-rAR/strings.xml | 58 + app/src/main/res/values-ru/strings.xml | 293 + app/src/main/res/values-si-rLK/strings.xml | 190 + app/src/main/res/values-sk-rSK/strings.xml | 15 + app/src/main/res/values-sk/strings.xml | 45 + app/src/main/res/values-sl/strings.xml | 79 + app/src/main/res/values-sn/strings.xml | 22 + app/src/main/res/values-sq/strings.xml | 30 + app/src/main/res/values-sr/strings.xml | 200 + app/src/main/res/values-sv/strings.xml | 293 + app/src/main/res/values-ta/strings.xml | 68 + app/src/main/res/values-th/strings.xml | 169 + app/src/main/res/values-tl/strings.xml | 249 + app/src/main/res/values-tr/strings.xml | 282 + app/src/main/res/values-uk/strings.xml | 278 + app/src/main/res/values-ur/strings.xml | 18 + app/src/main/res/values-uz/strings.xml | 47 + app/src/main/res/values-vi/strings.xml | 293 + app/src/main/res/values-zh-rCN/strings.xml | 298 + app/src/main/res/values-zh-rTW/strings.xml | 116 + app/src/main/res/values/arrays.xml | 16 + app/src/main/res/values/colors.xml | 8 + app/src/main/res/values/dimens.xml | 361 + app/src/main/res/values/strings.xml | 339 + app/src/main/res/values/styles.xml | 5 + app/src/main/res/values/theme.xml | 8 + app/src/main/res/xml/preferences.xml | 269 + assets/bridges.txt | 22 - build.gradle | 15 + description/bs.xlf | 85 + description/cs.xlf | 86 + description/de.xlf | 8 +- description/el.xlf | 85 + description/en-rGB.xlf | 85 + description/fr.xlf | 18 + description/gl.xlf | 2 + description/gu-rIN.xlf | 85 + description/gu.xlf | 85 + description/hi.xlf | 3 + description/hr-rHR.xlf | 85 + description/in.xlf | 2 + description/ky.xlf | 85 + description/ms.xlf | 86 + description/pa.xlf | 85 + description/pt-rBR.xlf | 3 + description/ru.xlf | 22 +- description/sk-rSK.xlf | 85 + description/sr.xlf | 26 +- description/ur.xlf | 85 + description/vi.xlf | 18 + description/zh-rTW.xlf | 22 +- ...d-limits.h-to-support-MAX_SIZE-on-Android.patch | 28 + external/Makefile | 40 +- external/patches/UDP-block.patch | 243 + .../orbot-patch-sporkbomb-20110501/Part 1.4 | 11 + ...real_transproxy_all-use_only_new_iptables.patch | 390 + .../orbot_leak_report | 110 + external/patches/transproxy.patch | 0 external/patches/udptransproxyfinal.patch | 247 + .../ic_launcher_gibberbot.png | Bin 0 -> 7527 bytes .../update_GibberBot_info.diff | 285 + external/tor | 2 +- gradle.properties | 16 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 160 + gradlew.bat | 90 + jni/Android.mk | 145 - jni/Application.mk | 4 - jni/libancillary/API | 139 - jni/libancillary/COPYING | 21 - jni/libancillary/Makefile | 73 - jni/libancillary/ancillary.h | 131 - jni/libancillary/fd_recv.c | 98 - jni/libancillary/fd_send.c | 92 - jni/libancillary/test.c | 112 - jni/pdnsd/AUTHORS | 58 - jni/pdnsd/COPYING | 674 -- jni/pdnsd/COPYING.BSD | 26 - jni/pdnsd/ChangeLog | 3304 ------ jni/pdnsd/ChangeLog.old | 161 - jni/pdnsd/INSTALL | 190 - jni/pdnsd/Makefile.am | 40 - jni/pdnsd/Makefile.in | 734 -- jni/pdnsd/NEWS | 324 - jni/pdnsd/PKGBUILD.in | 24 - jni/pdnsd/README | 22 - jni/pdnsd/README.par | 216 - jni/pdnsd/README.par.old | 249 - jni/pdnsd/THANKS | 66 - jni/pdnsd/TODO | 20 - jni/pdnsd/acconfig.h | 191 - jni/pdnsd/aclocal.m4 | 1021 -- jni/pdnsd/compile | 142 - jni/pdnsd/config.h | 437 - jni/pdnsd/config.h.in | 430 - jni/pdnsd/configure | 11389 ------------------- jni/pdnsd/configure.in | 548 - jni/pdnsd/contrib/Makefile.am | 2 - jni/pdnsd/contrib/Makefile.in | 323 - jni/pdnsd/contrib/README | 30 - jni/pdnsd/contrib/change_pdnsd_server_ip.pl | 124 - jni/pdnsd/contrib/dhcp2pdnsd | 45 - jni/pdnsd/contrib/pdnsd_dhcp.pl | 246 - jni/pdnsd/depcomp | 530 - jni/pdnsd/doc/Makefile.am | 28 - jni/pdnsd/doc/Makefile.in | 483 - jni/pdnsd/doc/doc_makefile | 38 - jni/pdnsd/doc/html/dl.html | 96 - jni/pdnsd/doc/html/dl.html.in | 96 - jni/pdnsd/doc/html/doc.html | 2630 ----- jni/pdnsd/doc/html/doc_makefile | 23 - jni/pdnsd/doc/html/faq.html | 412 - jni/pdnsd/doc/html/htmlsubst.pl | 36 - jni/pdnsd/doc/html/index.html | 686 -- jni/pdnsd/doc/html2confman.pl | 161 - jni/pdnsd/doc/pdnsd-ctl.8 | 198 - jni/pdnsd/doc/pdnsd.8.in | 326 - jni/pdnsd/doc/pdnsd.conf.5.in | 1328 --- jni/pdnsd/doc/pdnsd.conf.in | 143 - jni/pdnsd/doc/txt/doc_makefile | 21 - jni/pdnsd/doc/txt/faq.txt | 227 - jni/pdnsd/doc/txt/intro.txt | 305 - jni/pdnsd/doc/txt/manual.txt | 2017 ---- jni/pdnsd/file-list.base.in | 5 - jni/pdnsd/install-sh | 323 - jni/pdnsd/missing | 360 - jni/pdnsd/pdnsd.spec.in | 244 - jni/pdnsd/src/Makefile.am | 24 - jni/pdnsd/src/Makefile.in | 921 -- jni/pdnsd/src/cache.c | 2731 ----- jni/pdnsd/src/cache.h | 306 - jni/pdnsd/src/conf-keywords.h | 238 - jni/pdnsd/src/conf-parser.c | 2118 ---- jni/pdnsd/src/conf-parser.h | 29 - jni/pdnsd/src/conff.c | 544 - jni/pdnsd/src/conff.h | 190 - jni/pdnsd/src/consts.c | 133 - jni/pdnsd/src/consts.h | 69 - jni/pdnsd/src/debug.c | 64 - jni/pdnsd/src/debug.h | 52 - jni/pdnsd/src/dns.c | 617 - jni/pdnsd/src/dns.h | 309 - jni/pdnsd/src/dns_answer.c | 2170 ---- jni/pdnsd/src/dns_answer.h | 40 - jni/pdnsd/src/dns_query.c | 3798 ------- jni/pdnsd/src/dns_query.h | 51 - jni/pdnsd/src/error.c | 142 - jni/pdnsd/src/error.h | 115 - jni/pdnsd/src/freebsd_netinet_ip_icmp.h | 187 - jni/pdnsd/src/hash.c | 322 - jni/pdnsd/src/hash.h | 83 - jni/pdnsd/src/helpers.c | 795 -- jni/pdnsd/src/helpers.h | 319 - jni/pdnsd/src/icmp.c | 544 - jni/pdnsd/src/icmp.h | 43 - jni/pdnsd/src/ipvers.h | 297 - jni/pdnsd/src/list.c | 171 - jni/pdnsd/src/list.h | 170 - jni/pdnsd/src/main.c | 710 -- jni/pdnsd/src/make_rr_types_h.pl | 309 - jni/pdnsd/src/netdev.c | 363 - jni/pdnsd/src/netdev.h | 32 - jni/pdnsd/src/pdnsd-ctl/Makefile.am | 18 - jni/pdnsd/src/pdnsd-ctl/Makefile.in | 470 - jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c | 799 -- jni/pdnsd/src/pdnsd_assert.h | 51 - jni/pdnsd/src/rc/ArchLinux/Makefile.am | 7 - jni/pdnsd/src/rc/ArchLinux/Makefile.in | 332 - jni/pdnsd/src/rc/ArchLinux/pdnsd.in | 45 - jni/pdnsd/src/rc/Debian/Makefile.am | 8 - jni/pdnsd/src/rc/Debian/Makefile.in | 334 - jni/pdnsd/src/rc/Debian/pdnsd.in | 52 - jni/pdnsd/src/rc/Makefile.am | 5 - jni/pdnsd/src/rc/Makefile.in | 526 - jni/pdnsd/src/rc/README | 104 - jni/pdnsd/src/rc/RedHat/Makefile.am | 12 - jni/pdnsd/src/rc/RedHat/Makefile.in | 337 - jni/pdnsd/src/rc/RedHat/pdnsd.in | 88 - jni/pdnsd/src/rc/Slackware/Makefile.am | 3 - jni/pdnsd/src/rc/Slackware/Makefile.in | 330 - jni/pdnsd/src/rc/Slackware/rc.pdnsd.in | 74 - jni/pdnsd/src/rc/SuSE/Makefile.am | 22 - jni/pdnsd/src/rc/SuSE/Makefile.in | 345 - jni/pdnsd/src/rc/SuSE/pdnsd.in | 68 - jni/pdnsd/src/rr_types.c | 172 - jni/pdnsd/src/rr_types.h | 536 - jni/pdnsd/src/rr_types.in | 99 - jni/pdnsd/src/servers.c | 856 -- jni/pdnsd/src/servers.h | 68 - jni/pdnsd/src/sort_namevalues.pl | 25 - jni/pdnsd/src/status.c | 824 -- jni/pdnsd/src/status.h | 59 - jni/pdnsd/src/test/Makefile.am | 35 - jni/pdnsd/src/test/Makefile.in | 464 - jni/pdnsd/src/test/if_up.c | 36 - jni/pdnsd/src/test/is_local_addr.c | 57 - jni/pdnsd/src/test/random.c | 33 - jni/pdnsd/src/test/tping.c | 59 - jni/pdnsd/src/thread.c | 85 - jni/pdnsd/src/thread.h | 143 - jni/pdnsd/version | 1 - jsocksAndroid/build.gradle | 18 + jsocksAndroid/src/main/AndroidManifest.xml | 11 + .../com/runjva/sourceforge/jsocks/main/SOCKS.java | 267 + .../jsocks/protocol/Authentication.java | 35 + .../jsocks/protocol/AuthenticationNone.java | 22 + .../sourceforge/jsocks/protocol/InetRange.java | 492 + .../sourceforge/jsocks/protocol/ProxyMessage.java | 118 + .../sourceforge/jsocks/protocol/ProxyServer.java | 699 ++ .../sourceforge/jsocks/protocol/Socks4Message.java | 167 + .../sourceforge/jsocks/protocol/Socks4Proxy.java | 144 + .../jsocks/protocol/Socks5DatagramSocket.java | 480 + .../sourceforge/jsocks/protocol/Socks5Message.java | 325 + .../sourceforge/jsocks/protocol/Socks5Proxy.java | 295 + .../jsocks/protocol/SocksException.java | 111 + .../jsocks/protocol/SocksProxyBase.java | 543 + .../jsocks/protocol/SocksServerSocket.java | 235 + .../sourceforge/jsocks/protocol/SocksSocket.java | 385 + .../jsocks/protocol/UDPEncapsulation.java | 33 + .../jsocks/protocol/UDPRelayServer.java | 227 + .../protocol/UserPasswordAuthentication.java | 91 + .../runjva/sourceforge/jsocks/server/Ident.java | 171 + .../jsocks/server/IdentAuthenticator.java | 182 + .../jsocks/server/ServerAuthenticator.java | 126 + .../jsocks/server/ServerAuthenticatorBase.java | 187 + .../jsocks/server/ServerAuthenticatorNone.java | 16 + .../jsocks/server/UserPasswordAuthenticator.java | 82 + .../sourceforge/jsocks/server/UserValidation.java | 24 + libs/android-support-v4.jar | Bin 1364299 -> 0 bytes orbotservice/.gitignore | 1 + orbotservice/build.gradle | 33 + orbotservice/proguard-rules.pro | 17 + .../android/service/ApplicationTest.java | 13 + orbotservice/src/main/AndroidManifest.xml | 5 + orbotservice/src/main/assets/bridges.txt | 22 + .../main/java/net/freehaven/tor/control/.cvsignore | 1 + .../main/java/net/freehaven/tor/control/Bytes.java | 114 + .../net/freehaven/tor/control/ConfigEntry.java | 20 + .../net/freehaven/tor/control/EventHandler.java | 75 + .../freehaven/tor/control/NullEventHandler.java | 18 + .../net/freehaven/tor/control/PasswordDigest.java | 98 + .../src/main/java/net/freehaven/tor/control/README | 4 + .../freehaven/tor/control/TorControlCommands.java | 148 + .../tor/control/TorControlConnection.java | 732 ++ .../net/freehaven/tor/control/TorControlError.java | 39 + .../tor/control/TorControlSyntaxError.java | 16 + .../net/freehaven/tor/control/examples/.cvsignore | 1 + .../control/examples/DebuggingEventHandler.java | 44 + .../net/freehaven/tor/control/examples/Main.java | 146 + .../android/service/HiddenServiceManager.java | 25 + .../torproject/android/service/OrbotConstants.java | 37 + .../android/service/StartTorReceiver.java | 37 + .../android/service/TorEventHandler.java | 325 + .../org/torproject/android/service/TorService.java | 1987 ++++ .../android/service/TorServiceConstants.java | 162 + .../torproject/android/service/TorrcConfig.java | 33 + .../android/service/transproxy/TorTransProxy.java | 983 ++ .../android/service/transproxy/TorifiedApp.java | 261 + .../android/service/util/DummyActivity.java | 15 + .../org/torproject/android/service/util/Prefs.java | 132 + .../android/service/util/TorResourceInstaller.java | 344 + .../android/service/util/TorServiceUtils.java | 182 + .../org/torproject/android/service/util/Utils.java | 100 + .../android/service/vpn/OrbotVpnManager.java | 459 + .../android/service/vpn/TorVpnService.java | 42 + .../torproject/android/service/vpn/Tun2Socks.java | 123 + orbotservice/src/main/jni/Android.mk | 145 + orbotservice/src/main/jni/Application.mk | 4 + orbotservice/src/main/jni/libancillary/API | 139 + orbotservice/src/main/jni/libancillary/COPYING | 21 + orbotservice/src/main/jni/libancillary/Makefile | 73 + orbotservice/src/main/jni/libancillary/ancillary.h | 131 + orbotservice/src/main/jni/libancillary/fd_recv.c | 98 + orbotservice/src/main/jni/libancillary/fd_send.c | 92 + orbotservice/src/main/jni/libancillary/test.c | 112 + orbotservice/src/main/jni/pdnsd/AUTHORS | 58 + orbotservice/src/main/jni/pdnsd/COPYING | 674 ++ orbotservice/src/main/jni/pdnsd/COPYING.BSD | 26 + orbotservice/src/main/jni/pdnsd/ChangeLog | 3304 ++++++ orbotservice/src/main/jni/pdnsd/ChangeLog.old | 161 + orbotservice/src/main/jni/pdnsd/INSTALL | 190 + orbotservice/src/main/jni/pdnsd/Makefile.am | 40 + orbotservice/src/main/jni/pdnsd/Makefile.in | 734 ++ orbotservice/src/main/jni/pdnsd/NEWS | 324 + orbotservice/src/main/jni/pdnsd/PKGBUILD.in | 24 + orbotservice/src/main/jni/pdnsd/README | 22 + orbotservice/src/main/jni/pdnsd/README.par | 216 + orbotservice/src/main/jni/pdnsd/README.par.old | 249 + orbotservice/src/main/jni/pdnsd/THANKS | 66 + orbotservice/src/main/jni/pdnsd/TODO | 20 + orbotservice/src/main/jni/pdnsd/acconfig.h | 191 + orbotservice/src/main/jni/pdnsd/aclocal.m4 | 1021 ++ orbotservice/src/main/jni/pdnsd/compile | 142 + orbotservice/src/main/jni/pdnsd/config.h | 437 + orbotservice/src/main/jni/pdnsd/config.h.in | 430 + orbotservice/src/main/jni/pdnsd/configure | 11389 +++++++++++++++++++ orbotservice/src/main/jni/pdnsd/configure.in | 548 + .../src/main/jni/pdnsd/contrib/Makefile.am | 2 + .../src/main/jni/pdnsd/contrib/Makefile.in | 323 + orbotservice/src/main/jni/pdnsd/contrib/README | 30 + .../jni/pdnsd/contrib/change_pdnsd_server_ip.pl | 124 + orbotservice/src/main/jni/pdnsd/contrib/dhcp2pdnsd | 45 + .../src/main/jni/pdnsd/contrib/pdnsd_dhcp.pl | 246 + orbotservice/src/main/jni/pdnsd/depcomp | 530 + orbotservice/src/main/jni/pdnsd/file-list.base.in | 5 + orbotservice/src/main/jni/pdnsd/install-sh | 323 + orbotservice/src/main/jni/pdnsd/missing | 360 + orbotservice/src/main/jni/pdnsd/pdnsd.spec.in | 244 + orbotservice/src/main/jni/pdnsd/src/Makefile.am | 24 + orbotservice/src/main/jni/pdnsd/src/Makefile.in | 921 ++ orbotservice/src/main/jni/pdnsd/src/cache.c | 2731 +++++ orbotservice/src/main/jni/pdnsd/src/cache.h | 306 + .../src/main/jni/pdnsd/src/conf-keywords.h | 238 + orbotservice/src/main/jni/pdnsd/src/conf-parser.c | 2118 ++++ orbotservice/src/main/jni/pdnsd/src/conf-parser.h | 29 + orbotservice/src/main/jni/pdnsd/src/conff.c | 544 + orbotservice/src/main/jni/pdnsd/src/conff.h | 190 + orbotservice/src/main/jni/pdnsd/src/consts.c | 133 + orbotservice/src/main/jni/pdnsd/src/consts.h | 69 + orbotservice/src/main/jni/pdnsd/src/debug.c | 64 + orbotservice/src/main/jni/pdnsd/src/debug.h | 52 + orbotservice/src/main/jni/pdnsd/src/dns.c | 617 + orbotservice/src/main/jni/pdnsd/src/dns.h | 309 + orbotservice/src/main/jni/pdnsd/src/dns_answer.c | 2170 ++++ orbotservice/src/main/jni/pdnsd/src/dns_answer.h | 40 + orbotservice/src/main/jni/pdnsd/src/dns_query.c | 3798 +++++++ orbotservice/src/main/jni/pdnsd/src/dns_query.h | 51 + orbotservice/src/main/jni/pdnsd/src/error.c | 142 + orbotservice/src/main/jni/pdnsd/src/error.h | 115 + .../main/jni/pdnsd/src/freebsd_netinet_ip_icmp.h | 187 + orbotservice/src/main/jni/pdnsd/src/hash.c | 322 + orbotservice/src/main/jni/pdnsd/src/hash.h | 83 + orbotservice/src/main/jni/pdnsd/src/helpers.c | 795 ++ orbotservice/src/main/jni/pdnsd/src/helpers.h | 319 + orbotservice/src/main/jni/pdnsd/src/icmp.c | 544 + orbotservice/src/main/jni/pdnsd/src/icmp.h | 43 + orbotservice/src/main/jni/pdnsd/src/ipvers.h | 297 + orbotservice/src/main/jni/pdnsd/src/list.c | 171 + orbotservice/src/main/jni/pdnsd/src/list.h | 170 + orbotservice/src/main/jni/pdnsd/src/main.c | 710 ++ .../src/main/jni/pdnsd/src/make_rr_types_h.pl | 309 + orbotservice/src/main/jni/pdnsd/src/netdev.c | 363 + orbotservice/src/main/jni/pdnsd/src/netdev.h | 32 + .../src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.am | 18 + .../src/main/jni/pdnsd/src/pdnsd-ctl/Makefile.in | 470 + .../src/main/jni/pdnsd/src/pdnsd-ctl/pdnsd-ctl.c | 799 ++ orbotservice/src/main/jni/pdnsd/src/pdnsd_assert.h | 51 + .../main/jni/pdnsd/src/rc/ArchLinux/Makefile.am | 7 + .../main/jni/pdnsd/src/rc/ArchLinux/Makefile.in | 332 + .../src/main/jni/pdnsd/src/rc/ArchLinux/pdnsd.in | 45 + .../src/main/jni/pdnsd/src/rc/Debian/Makefile.am | 8 + .../src/main/jni/pdnsd/src/rc/Debian/Makefile.in | 334 + .../src/main/jni/pdnsd/src/rc/Debian/pdnsd.in | 52 + orbotservice/src/main/jni/pdnsd/src/rc/Makefile.am | 5 + orbotservice/src/main/jni/pdnsd/src/rc/Makefile.in | 526 + orbotservice/src/main/jni/pdnsd/src/rc/README | 104 + .../src/main/jni/pdnsd/src/rc/RedHat/Makefile.am | 12 + .../src/main/jni/pdnsd/src/rc/RedHat/Makefile.in | 337 + .../src/main/jni/pdnsd/src/rc/RedHat/pdnsd.in | 88 + .../main/jni/pdnsd/src/rc/Slackware/Makefile.am | 3 + .../main/jni/pdnsd/src/rc/Slackware/Makefile.in | 330 + .../main/jni/pdnsd/src/rc/Slackware/rc.pdnsd.in | 74 + .../src/main/jni/pdnsd/src/rc/SuSE/Makefile.am | 22 + .../src/main/jni/pdnsd/src/rc/SuSE/Makefile.in | 345 + .../src/main/jni/pdnsd/src/rc/SuSE/pdnsd.in | 68 + orbotservice/src/main/jni/pdnsd/src/rr_types.c | 172 + orbotservice/src/main/jni/pdnsd/src/rr_types.h | 536 + orbotservice/src/main/jni/pdnsd/src/rr_types.in | 99 + orbotservice/src/main/jni/pdnsd/src/servers.c | 856 ++ orbotservice/src/main/jni/pdnsd/src/servers.h | 68 + .../src/main/jni/pdnsd/src/sort_namevalues.pl | 25 + orbotservice/src/main/jni/pdnsd/src/status.c | 824 ++ orbotservice/src/main/jni/pdnsd/src/status.h | 59 + .../src/main/jni/pdnsd/src/test/Makefile.am | 35 + .../src/main/jni/pdnsd/src/test/Makefile.in | 464 + orbotservice/src/main/jni/pdnsd/src/test/if_up.c | 36 + .../src/main/jni/pdnsd/src/test/is_local_addr.c | 57 + orbotservice/src/main/jni/pdnsd/src/test/random.c | 33 + orbotservice/src/main/jni/pdnsd/src/test/tping.c | 59 + orbotservice/src/main/jni/pdnsd/src/thread.c | 85 + orbotservice/src/main/jni/pdnsd/src/thread.h | 143 + orbotservice/src/main/jni/pdnsd/version | 1 + .../src/main/jniLibs/armeabi/libtun2socks.so | Bin 0 -> 129472 bytes .../res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 480 bytes .../src/main/res/drawable-hdpi-v11/ic_stat_tor.png | Bin 0 -> 802 bytes .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 0 -> 744 bytes .../res/drawable-hdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 967 bytes .../src/main/res/drawable-hdpi-v11/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 616 bytes .../src/main/res/drawable-hdpi-v9/ic_stat_tor.png | Bin 0 -> 713 bytes .../src/main/res/drawable-hdpi-v9/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-hdpi/ic_action_settings.png | Bin 0 -> 553 bytes .../src/main/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 4194 bytes .../main/res/drawable-hdpi/ic_stat_notifyerr.png | Bin 0 -> 1312 bytes .../src/main/res/drawable-hdpi/ic_stat_tor.png | Bin 0 -> 852 bytes .../main/res/drawable-hdpi/ic_stat_tor_xfer.png | Bin 0 -> 990 bytes .../src/main/res/drawable-hdpi/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 0 -> 294 bytes .../src/main/res/drawable-ldpi-v11/ic_stat_tor.png | Bin 0 -> 390 bytes .../src/main/res/drawable-ldpi-v11/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 0 -> 342 bytes .../src/main/res/drawable-ldpi-v9/ic_stat_tor.png | Bin 0 -> 358 bytes .../src/main/res/drawable-ldpi-v9/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-ldpi/ic_action_settings.png | Bin 0 -> 319 bytes .../src/main/res/drawable-ldpi/ic_launcher.png | Bin 0 -> 2852 bytes .../main/res/drawable-ldpi/ic_stat_notifyerr.png | Bin 0 -> 647 bytes .../src/main/res/drawable-ldpi/ic_stat_tor.png | Bin 0 -> 606 bytes .../src/main/res/drawable-ldpi/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 357 bytes .../src/main/res/drawable-mdpi-v11/ic_stat_tor.png | Bin 0 -> 517 bytes .../res/drawable-mdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 607 bytes .../src/main/res/drawable-mdpi-v11/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 458 bytes .../src/main/res/drawable-mdpi-v9/ic_stat_tor.png | Bin 0 -> 475 bytes .../src/main/res/drawable-mdpi-v9/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-mdpi/ic_action_settings.png | Bin 0 -> 364 bytes .../src/main/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 2677 bytes .../main/res/drawable-mdpi/ic_stat_notifyerr.png | Bin 0 -> 883 bytes .../src/main/res/drawable-mdpi/ic_stat_tor.png | Bin 0 -> 535 bytes .../main/res/drawable-mdpi/ic_stat_tor_xfer.png | Bin 0 -> 600 bytes .../src/main/res/drawable-mdpi/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 0 -> 618 bytes .../main/res/drawable-xhdpi-v11/ic_stat_tor.png | Bin 0 -> 1165 bytes .../res/drawable-xhdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 1337 bytes .../src/main/res/drawable-xhdpi-v11/inverse.png | Bin 0 -> 1027 bytes .../res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 0 -> 747 bytes .../src/main/res/drawable-xhdpi-v9/ic_stat_tor.png | Bin 0 -> 970 bytes .../src/main/res/drawable-xhdpi-v9/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-xhdpi/ic_action_settings.png | Bin 0 -> 716 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 5964 bytes .../main/res/drawable-xhdpi/ic_stat_notifyerr.png | Bin 0 -> 1796 bytes .../src/main/res/drawable-xhdpi/ic_stat_tor.png | Bin 0 -> 1161 bytes .../main/res/drawable-xhdpi/ic_stat_tor_xfer.png | Bin 0 -> 1378 bytes .../src/main/res/drawable-xhdpi/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-xxhdpi-v11/ic_stat_tor.png | Bin 0 -> 1903 bytes .../res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 2019 bytes .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 9556 bytes .../src/main/res/drawable-xxhdpi/ic_stat_tor.png | Bin 0 -> 1872 bytes .../main/res/drawable-xxhdpi/ic_stat_tor_xfer.png | Bin 0 -> 2216 bytes .../src/main/res/drawable-xxhdpi/inverse.png | Bin 0 -> 1027 bytes .../main/res/drawable-xxxhdpi-v11/ic_stat_tor.png | Bin 0 -> 2661 bytes .../res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png | Bin 0 -> 3156 bytes .../src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin 0 -> 13297 bytes .../src/main/res/drawable-xxxhdpi/ic_stat_tor.png | Bin 0 -> 2631 bytes .../main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png | Bin 0 -> 2859 bytes .../src/main/res/drawable-xxxhdpi/inverse.png | Bin 0 -> 1027 bytes orbotservice/src/main/res/drawable/button.xml | 37 + orbotservice/src/main/res/drawable/button_off.xml | 37 + orbotservice/src/main/res/drawable/button_on.xml | 35 + .../src/main/res/drawable/classyfabric.png | Bin 0 -> 8856 bytes orbotservice/src/main/res/drawable/error.png | Bin 0 -> 2922 bytes .../src/main/res/drawable/ic_chatsecure.png | Bin 0 -> 4013 bytes .../src/main/res/drawable/ic_duckduckgo.png | Bin 0 -> 5042 bytes orbotservice/src/main/res/drawable/ic_launcher.png | Bin 0 -> 6055 bytes .../src/main/res/drawable/ic_menu_about.png | Bin 0 -> 1771 bytes .../src/main/res/drawable/ic_menu_exit.png | Bin 0 -> 2693 bytes .../src/main/res/drawable/ic_menu_goto.png | Bin 0 -> 1636 bytes orbotservice/src/main/res/drawable/ic_play.png | Bin 0 -> 3560 bytes .../src/main/res/drawable/ic_stat_tor_off.png | Bin 0 -> 744 bytes .../src/main/res/drawable/ic_stat_tor_xfer.png | Bin 0 -> 600 bytes orbotservice/src/main/res/drawable/ic_twitter.png | Bin 0 -> 2797 bytes orbotservice/src/main/res/drawable/icon_martus.png | Bin 0 -> 6763 bytes orbotservice/src/main/res/drawable/icon_orfox.png | Bin 0 -> 7617 bytes .../src/main/res/drawable/icon_story_maker.png | Bin 0 -> 4290 bytes orbotservice/src/main/res/drawable/inverse.png | Bin 0 -> 1027 bytes orbotservice/src/main/res/drawable/n8fr8.jpg | Bin 0 -> 18062 bytes orbotservice/src/main/res/drawable/oldtoroff.png | Bin 0 -> 63700 bytes orbotservice/src/main/res/drawable/oldtoron.png | Bin 0 -> 121036 bytes .../src/main/res/drawable/oldtorstarting.png | Bin 0 -> 111753 bytes orbotservice/src/main/res/drawable/onion32.png | Bin 0 -> 1599 bytes orbotservice/src/main/res/drawable/tilebg.xml | 4 + orbotservice/src/main/res/drawable/toggle.xml | 8 + orbotservice/src/main/res/drawable/tor.png | Bin 0 -> 4766 bytes orbotservice/src/main/res/drawable/tor25.png | Bin 0 -> 2227 bytes orbotservice/src/main/res/drawable/toroff.png | Bin 0 -> 39556 bytes orbotservice/src/main/res/drawable/toron.png | Bin 0 -> 47022 bytes orbotservice/src/main/res/drawable/torstarting.png | Bin 0 -> 41700 bytes .../res/layout/layout_notification_expanded.xml | 122 + .../notification_template_part_chronometer.xml | 25 + .../res/layout/notification_template_part_time.xml | 25 + orbotservice/src/main/res/raw/geoip.mp3 | Bin 0 -> 609031 bytes orbotservice/src/main/res/raw/geoip6.mp3 | 1663 +++ orbotservice/src/main/res/raw/pluto.properties | 3 + orbotservice/src/main/res/raw/torpolipo.conf | 23 + orbotservice/src/main/res/raw/torrc | 8 + orbotservice/src/main/res/values-ach/strings.xml | 12 + orbotservice/src/main/res/values-ar/strings.xml | 262 + orbotservice/src/main/res/values-az/strings.xml | 297 + orbotservice/src/main/res/values-bg/strings.xml | 293 + .../src/main/res/values-bn-rBD/strings.xml | 40 + .../src/main/res/values-bn-rIN/strings.xml | 12 + orbotservice/src/main/res/values-bn/strings.xml | 12 + orbotservice/src/main/res/values-brx/strings.xml | 12 + orbotservice/src/main/res/values-bs/strings.xml | 18 + orbotservice/src/main/res/values-ca/strings.xml | 226 + .../src/main/res/values-cs-rCZ/strings.xml | 223 + orbotservice/src/main/res/values-cs/strings.xml | 74 + orbotservice/src/main/res/values-cy/strings.xml | 81 + orbotservice/src/main/res/values-da/strings.xml | 203 + .../src/main/res/values-de-rAT/strings.xml | 12 + orbotservice/src/main/res/values-de/strings.xml | 293 + orbotservice/src/main/res/values-el/strings.xml | 208 + .../src/main/res/values-en-rGB/strings.xml | 13 + orbotservice/src/main/res/values-eo/strings.xml | 146 + .../src/main/res/values-es-rAR/strings.xml | 69 + orbotservice/src/main/res/values-es/strings.xml | 294 + orbotservice/src/main/res/values-et/strings.xml | 210 + orbotservice/src/main/res/values-eu/strings.xml | 218 + orbotservice/src/main/res/values-fa/strings.xml | 292 + orbotservice/src/main/res/values-fi/strings.xml | 278 + .../src/main/res/values-fr-rFR/strings.xml | 293 + orbotservice/src/main/res/values-fr/strings.xml | 54 + orbotservice/src/main/res/values-gl/strings.xml | 209 + .../src/main/res/values-gu-rIN/strings.xml | 14 + orbotservice/src/main/res/values-gu/strings.xml | 17 + orbotservice/src/main/res/values-he/strings.xml | 233 + orbotservice/src/main/res/values-hi/strings.xml | 26 + .../src/main/res/values-hr-rHR/strings.xml | 30 + orbotservice/src/main/res/values-hr/strings.xml | 293 + orbotservice/src/main/res/values-hu/strings.xml | 293 + .../src/main/res/values-hy-rAM/strings.xml | 12 + orbotservice/src/main/res/values-ia/strings.xml | 30 + orbotservice/src/main/res/values-id/strings.xml | 284 + .../src/main/res/values-in-rID/strings.xml | 284 + orbotservice/src/main/res/values-in/strings.xml | 48 + orbotservice/src/main/res/values-is/strings.xml | 278 + orbotservice/src/main/res/values-it/strings.xml | 293 + orbotservice/src/main/res/values-iw/strings.xml | 233 + orbotservice/src/main/res/values-ja/strings.xml | 293 + .../src/main/res/values-kn-rIN/strings.xml | 12 + orbotservice/src/main/res/values-kn/strings.xml | 12 + orbotservice/src/main/res/values-ko/strings.xml | 214 + orbotservice/src/main/res/values-ky/strings.xml | 21 + .../src/main/res/values-lt-rLT/strings.xml | 12 + orbotservice/src/main/res/values-lt/strings.xml | 28 + orbotservice/src/main/res/values-lv/strings.xml | 278 + orbotservice/src/main/res/values-mk/strings.xml | 278 + orbotservice/src/main/res/values-ml/strings.xml | 12 + orbotservice/src/main/res/values-mn/strings.xml | 12 + .../src/main/res/values-mr-rIN/strings.xml | 12 + .../src/main/res/values-ms-rMY/strings.xml | 196 + orbotservice/src/main/res/values-ms/strings.xml | 200 + orbotservice/src/main/res/values-my/strings.xml | 30 + orbotservice/src/main/res/values-nb/strings.xml | 258 + orbotservice/src/main/res/values-nl/strings.xml | 292 + orbotservice/src/main/res/values-pa/strings.xml | 19 + orbotservice/src/main/res/values-pl/strings.xml | 293 + orbotservice/src/main/res/values-ps/strings.xml | 12 + .../src/main/res/values-pt-rBR/strings.xml | 285 + .../src/main/res/values-pt-rPT/strings.xml | 14 + orbotservice/src/main/res/values-pt/strings.xml | 181 + .../src/main/res/values-ro-rRO/strings.xml | 30 + orbotservice/src/main/res/values-ro/strings.xml | 231 + .../src/main/res/values-rs-rAR/strings.xml | 58 + orbotservice/src/main/res/values-ru/strings.xml | 293 + .../src/main/res/values-si-rLK/strings.xml | 190 + .../src/main/res/values-sk-rSK/strings.xml | 15 + orbotservice/src/main/res/values-sk/strings.xml | 45 + orbotservice/src/main/res/values-sl/strings.xml | 79 + orbotservice/src/main/res/values-sn/strings.xml | 22 + orbotservice/src/main/res/values-sq/strings.xml | 30 + orbotservice/src/main/res/values-sr/strings.xml | 200 + orbotservice/src/main/res/values-sv/strings.xml | 293 + orbotservice/src/main/res/values-ta/strings.xml | 68 + orbotservice/src/main/res/values-th/strings.xml | 169 + orbotservice/src/main/res/values-tl/strings.xml | 249 + orbotservice/src/main/res/values-tr/strings.xml | 282 + orbotservice/src/main/res/values-uk/strings.xml | 278 + orbotservice/src/main/res/values-ur/strings.xml | 18 + orbotservice/src/main/res/values-uz/strings.xml | 47 + orbotservice/src/main/res/values-vi/strings.xml | 293 + .../src/main/res/values-zh-rCN/strings.xml | 298 + .../src/main/res/values-zh-rTW/strings.xml | 116 + orbotservice/src/main/res/values/arrays.xml | 16 + orbotservice/src/main/res/values/colors.xml | 8 + orbotservice/src/main/res/values/dimens.xml | 361 + orbotservice/src/main/res/values/pdnsd.xml | 33 + orbotservice/src/main/res/values/strings.xml | 339 + orbotservice/src/main/res/values/styles.xml | 5 + orbotservice/src/main/res/values/theme.xml | 8 + .../java/org/torproject/android/control/.cvsignore | 1 + .../java/org/torproject/android/control/Bytes.java | 114 + .../torproject/android/control/ConfigEntry.java | 20 + .../torproject/android/control/EventHandler.java | 75 + .../android/control/NullEventHandler.java | 18 + .../torproject/android/control/PasswordDigest.java | 98 + .../java/org/torproject/android/control/README | 4 + .../android/control/TorControlCommands.java | 148 + .../android/control/TorControlConnection.java | 730 ++ .../android/control/TorControlError.java | 39 + .../android/control/TorControlSyntaxError.java | 16 + .../torproject/android/control/examples/.cvsignore | 1 + .../control/examples/DebuggingEventHandler.java | 44 + .../torproject/android/control/examples/Main.java | 146 + .../android/service/ExampleUnitTest.java | 15 + patches/UDP-block.patch | 243 - patches/orbot-patch-sporkbomb-20110501/Part 1.4 | 11 - ...real_transproxy_all-use_only_new_iptables.patch | 390 - .../orbot_leak_report | 110 - patches/transproxy.patch | 0 patches/udptransproxyfinal.patch | 247 - .../ic_launcher_gibberbot.png | Bin 7527 -> 0 bytes .../update_GibberBot_info.diff | 285 - project.properties | 5 +- res/drawable-hdpi-v11/ic_stat_notifyerr.png | Bin 480 -> 0 bytes res/drawable-hdpi-v11/ic_stat_tor.png | Bin 802 -> 0 bytes res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 744 -> 0 bytes res/drawable-hdpi-v11/ic_stat_tor_xfer.png | Bin 967 -> 0 bytes res/drawable-hdpi-v11/inverse.png | Bin 1027 -> 0 bytes res/drawable-hdpi-v9/ic_stat_notifyerr.png | Bin 616 -> 0 bytes res/drawable-hdpi-v9/ic_stat_tor.png | Bin 713 -> 0 bytes res/drawable-hdpi-v9/inverse.png | Bin 1027 -> 0 bytes res/drawable-hdpi/ic_action_settings.png | Bin 553 -> 0 bytes res/drawable-hdpi/ic_launcher.png | Bin 4194 -> 0 bytes res/drawable-hdpi/ic_stat_notifyerr.png | Bin 1312 -> 0 bytes res/drawable-hdpi/ic_stat_tor.png | Bin 852 -> 0 bytes res/drawable-hdpi/ic_stat_tor_xfer.png | Bin 990 -> 0 bytes res/drawable-hdpi/inverse.png | Bin 1027 -> 0 bytes res/drawable-ldpi-v11/ic_stat_notifyerr.png | Bin 294 -> 0 bytes res/drawable-ldpi-v11/ic_stat_tor.png | Bin 390 -> 0 bytes res/drawable-ldpi-v11/inverse.png | Bin 1027 -> 0 bytes res/drawable-ldpi-v9/ic_stat_notifyerr.png | Bin 342 -> 0 bytes res/drawable-ldpi-v9/ic_stat_tor.png | Bin 358 -> 0 bytes res/drawable-ldpi-v9/inverse.png | Bin 1027 -> 0 bytes res/drawable-ldpi/ic_action_settings.png | Bin 319 -> 0 bytes res/drawable-ldpi/ic_launcher.png | Bin 2852 -> 0 bytes res/drawable-ldpi/ic_stat_notifyerr.png | Bin 647 -> 0 bytes res/drawable-ldpi/ic_stat_tor.png | Bin 606 -> 0 bytes res/drawable-ldpi/inverse.png | Bin 1027 -> 0 bytes res/drawable-mdpi-v11/ic_stat_notifyerr.png | Bin 357 -> 0 bytes res/drawable-mdpi-v11/ic_stat_tor.png | Bin 517 -> 0 bytes res/drawable-mdpi-v11/ic_stat_tor_xfer.png | Bin 607 -> 0 bytes res/drawable-mdpi-v11/inverse.png | Bin 1027 -> 0 bytes res/drawable-mdpi-v9/ic_stat_notifyerr.png | Bin 458 -> 0 bytes res/drawable-mdpi-v9/ic_stat_tor.png | Bin 475 -> 0 bytes res/drawable-mdpi-v9/inverse.png | Bin 1027 -> 0 bytes res/drawable-mdpi/ic_action_settings.png | Bin 364 -> 0 bytes res/drawable-mdpi/ic_launcher.png | Bin 2677 -> 0 bytes res/drawable-mdpi/ic_stat_notifyerr.png | Bin 883 -> 0 bytes res/drawable-mdpi/ic_stat_tor.png | Bin 535 -> 0 bytes res/drawable-mdpi/ic_stat_tor_xfer.png | Bin 600 -> 0 bytes res/drawable-mdpi/inverse.png | Bin 1027 -> 0 bytes res/drawable-xhdpi-v11/ic_stat_notifyerr.png | Bin 618 -> 0 bytes res/drawable-xhdpi-v11/ic_stat_tor.png | Bin 1165 -> 0 bytes res/drawable-xhdpi-v11/ic_stat_tor_xfer.png | Bin 1337 -> 0 bytes res/drawable-xhdpi-v11/inverse.png | Bin 1027 -> 0 bytes res/drawable-xhdpi-v9/ic_stat_notifyerr.png | Bin 747 -> 0 bytes res/drawable-xhdpi-v9/ic_stat_tor.png | Bin 970 -> 0 bytes res/drawable-xhdpi-v9/inverse.png | Bin 1027 -> 0 bytes res/drawable-xhdpi/ic_action_settings.png | Bin 716 -> 0 bytes res/drawable-xhdpi/ic_launcher.png | Bin 5964 -> 0 bytes res/drawable-xhdpi/ic_stat_notifyerr.png | Bin 1796 -> 0 bytes res/drawable-xhdpi/ic_stat_tor.png | Bin 1161 -> 0 bytes res/drawable-xhdpi/ic_stat_tor_xfer.png | Bin 1378 -> 0 bytes res/drawable-xhdpi/inverse.png | Bin 1027 -> 0 bytes res/drawable-xxhdpi-v11/ic_stat_tor.png | Bin 1903 -> 0 bytes res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png | Bin 2019 -> 0 bytes res/drawable-xxhdpi/ic_launcher.png | Bin 9556 -> 0 bytes res/drawable-xxhdpi/ic_stat_tor.png | Bin 1872 -> 0 bytes res/drawable-xxhdpi/ic_stat_tor_xfer.png | Bin 2216 -> 0 bytes res/drawable-xxhdpi/inverse.png | Bin 1027 -> 0 bytes res/drawable-xxxhdpi-v11/ic_stat_tor.png | Bin 2661 -> 0 bytes res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png | Bin 3156 -> 0 bytes res/drawable-xxxhdpi/ic_launcher.png | Bin 13297 -> 0 bytes res/drawable-xxxhdpi/ic_stat_tor.png | Bin 2631 -> 0 bytes res/drawable-xxxhdpi/ic_stat_tor_xfer.png | Bin 2859 -> 0 bytes res/drawable-xxxhdpi/inverse.png | Bin 1027 -> 0 bytes res/drawable/button.xml | 37 - res/drawable/button_off.xml | 37 - res/drawable/button_on.xml | 35 - res/drawable/classyfabric.png | Bin 8856 -> 0 bytes res/drawable/error.png | Bin 2922 -> 0 bytes res/drawable/ic_chatsecure.png | Bin 4013 -> 0 bytes res/drawable/ic_duckduckgo.png | Bin 5042 -> 0 bytes res/drawable/ic_launcher.png | Bin 6055 -> 0 bytes res/drawable/ic_menu_about.png | Bin 1771 -> 0 bytes res/drawable/ic_menu_exit.png | Bin 2693 -> 0 bytes res/drawable/ic_menu_goto.png | Bin 1636 -> 0 bytes res/drawable/ic_play.png | Bin 3560 -> 0 bytes res/drawable/ic_stat_tor_off.png | Bin 744 -> 0 bytes res/drawable/ic_stat_tor_xfer.png | Bin 600 -> 0 bytes res/drawable/ic_twitter.png | Bin 2797 -> 0 bytes res/drawable/icon_martus.png | Bin 6763 -> 0 bytes res/drawable/icon_orfox.png | Bin 7617 -> 0 bytes res/drawable/icon_story_maker.png | Bin 4290 -> 0 bytes res/drawable/inverse.png | Bin 1027 -> 0 bytes res/drawable/n8fr8.jpg | Bin 18062 -> 0 bytes res/drawable/oldtoroff.png | Bin 63700 -> 0 bytes res/drawable/oldtoron.png | Bin 121036 -> 0 bytes res/drawable/oldtorstarting.png | Bin 111753 -> 0 bytes res/drawable/onion32.png | Bin 1599 -> 0 bytes res/drawable/tilebg.xml | 4 - res/drawable/toggle.xml | 8 - res/drawable/tor.png | Bin 4766 -> 0 bytes res/drawable/tor25.png | Bin 2227 -> 0 bytes res/drawable/toroff.png | Bin 39556 -> 0 bytes res/drawable/toron.png | Bin 47022 -> 0 bytes res/drawable/torstarting.png | Bin 41700 -> 0 bytes res/layout-v21/layout_notification_expanded.xml | 123 - res/layout/layout_about.xml | 120 - res/layout/layout_apps.xml | 74 - res/layout/layout_apps_item.xml | 17 - res/layout/layout_diag.xml | 14 - res/layout/layout_help.xml | 20 - res/layout/layout_log.xml | 52 - res/layout/layout_main.xml | 244 - res/layout/layout_notification_expanded.xml | 122 - res/layout/layout_promo_apps.xml | 115 - res/layout/layout_settings.xml | 29 - res/layout/layout_vpn_setup.xml | 34 - .../notification_template_part_chronometer.xml | 25 - res/layout/notification_template_part_time.xml | 25 - res/layout/scrollingtext_buttons_view.xml | 34 - res/menu/orbot_main.xml | 70 - res/menu/share_menu.xml | 7 - res/raw/geoip.mp3 | Bin 609031 -> 0 bytes res/raw/geoip6.mp3 | 1663 --- res/raw/pluto.properties | 3 - res/raw/torpolipo.conf | 23 - res/raw/torrc | 8 - res/values-ach/strings.xml | 12 - res/values-ar/strings.xml | 214 - res/values-az/strings.xml | 283 - res/values-bg/strings.xml | 292 - res/values-bn-rBD/strings.xml | 41 - res/values-bn-rIN/strings.xml | 12 - res/values-bn/strings.xml | 12 - res/values-brx/strings.xml | 12 - res/values-bs/strings.xml | 24 - res/values-ca/strings.xml | 226 - res/values-cs-rCZ/strings.xml | 223 - res/values-cs/strings.xml | 81 - res/values-cy/strings.xml | 84 - res/values-da/strings.xml | 203 - res/values-de-rAT/strings.xml | 12 - res/values-de/strings.xml | 292 - res/values-el/strings.xml | 208 - res/values-en-rGB/strings.xml | 19 - res/values-eo/strings.xml | 151 - res/values-es-rAR/strings.xml | 72 - res/values-es/strings.xml | 293 - res/values-et/strings.xml | 210 - res/values-eu/strings.xml | 218 - res/values-fa/strings.xml | 289 - res/values-fi/strings.xml | 278 - res/values-fr-rFR/strings.xml | 292 - res/values-fr/strings.xml | 290 - res/values-gl/strings.xml | 208 - res/values-gu-rIN/strings.xml | 20 - res/values-gu/strings.xml | 23 - res/values-he | 1 - res/values-hi/strings.xml | 23 - res/values-hr-rHR/strings.xml | 36 - res/values-hr/strings.xml | 278 - res/values-hu/strings.xml | 292 - res/values-hy-rAM/strings.xml | 12 - res/values-ia/strings.xml | 30 - res/values-id | 1 - res/values-in-rID/strings.xml | 278 - res/values-in/strings.xml | 48 - res/values-is/strings.xml | 278 - res/values-it/strings.xml | 292 - res/values-iw/strings.xml | 233 - res/values-ja/strings.xml | 292 - res/values-kn-rIN/strings.xml | 12 - res/values-kn/strings.xml | 12 - res/values-ko/strings.xml | 214 - res/values-ky/strings.xml | 27 - res/values-lt-rLT/strings.xml | 12 - res/values-lt/strings.xml | 28 - res/values-lv/strings.xml | 278 - res/values-mk/strings.xml | 278 - res/values-ml/strings.xml | 12 - res/values-mn/strings.xml | 12 - res/values-mr-rIN/strings.xml | 12 - res/values-ms-rMY/strings.xml | 196 - res/values-ms/strings.xml | 200 - res/values-my/strings.xml | 30 - res/values-nb/strings.xml | 258 - res/values-nl/strings.xml | 292 - res/values-pa/strings.xml | 25 - res/values-pl/strings.xml | 278 - res/values-ps/strings.xml | 12 - res/values-pt-rBR/strings.xml | 234 - res/values-pt-rPT/strings.xml | 14 - res/values-pt/strings.xml | 181 - res/values-ro-rRO/strings.xml | 30 - res/values-ro/strings.xml | 231 - res/values-rs-rAR/strings.xml | 58 - res/values-ru/strings.xml | 292 - res/values-si-rLK/strings.xml | 190 - res/values-sk-rSK/strings.xml | 21 - res/values-sk/strings.xml | 47 - res/values-sl/strings.xml | 82 - res/values-sn/strings.xml | 22 - res/values-sq/strings.xml | 30 - res/values-sr/strings.xml | 197 - res/values-sv/strings.xml | 292 - res/values-ta/strings.xml | 61 - res/values-th/strings.xml | 169 - res/values-tl/strings.xml | 139 - res/values-tr/strings.xml | 282 - res/values-uk/strings.xml | 278 - res/values-ur/strings.xml | 24 - res/values-uz/strings.xml | 48 - res/values-vi/strings.xml | 208 - res/values-zh-rCN/strings.xml | 298 - res/values-zh-rTW/strings.xml | 89 - res/values/arrays.xml | 16 - res/values/colors.xml | 8 - res/values/dimens.xml | 361 - res/values/pdnsd.xml | 33 - res/values/strings.xml | 339 - res/values/styles.xml | 5 - res/values/theme.xml | 8 - res/xml/preferences.xml | 269 - settings.gradle | 2 + .../integration/android/IntentIntegrator.java | 506 - .../zxing/integration/android/IntentResult.java | 95 - src/info/guardianproject/util/Languages.java | 233 - src/net | 1 - src/org/torproject/android/OrbotApp.java | 78 - src/org/torproject/android/OrbotConstants.java | 37 - src/org/torproject/android/OrbotMainActivity.java | 1442 --- src/org/torproject/android/Prefs.java | 134 - .../torproject/android/service/DummyActivity.java | 15 - .../android/service/HiddenServiceManager.java | 25 - .../torproject/android/service/OnBootReceiver.java | 46 - .../android/service/StartTorReceiver.java | 36 - .../android/service/TorResourceInstaller.java | 372 - src/org/torproject/android/service/TorService.java | 2276 ---- .../android/service/TorServiceConstants.java | 163 - .../android/service/TorServiceUtils.java | 188 - .../torproject/android/service/TorTransProxy.java | 763 -- .../torproject/android/service/TorrcConfig.java | 33 - src/org/torproject/android/service/Utils.java | 100 - .../torproject/android/settings/AppManager.java | 389 - .../android/settings/SettingsPreferences.java | 183 - .../torproject/android/settings/TorifiedApp.java | 139 - .../torproject/android/ui/BridgeSetupActivity.java | 5 - .../torproject/android/ui/ImageProgressView.java | 78 - .../android/ui/OrbotDiagnosticsActivity.java | 333 - .../torproject/android/ui/PromoAppsActivity.java | 215 - .../torproject/android/ui/Rotate3dAnimation.java | 76 - .../torproject/android/ui/VPNSetupActivity.java | 5 - .../torproject/android/vpn/OrbotVpnManager.java | 455 - src/org/torproject/android/vpn/Tun2Socks.java | 126 - .../torproject/android/vpn/VPNEnableActivity.java | 164 - 1046 files changed, 101368 insertions(+), 85642 deletions(-)

1 0

[orbot/master] add the compiled tun2socks lib for devs who just want to work on UI
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit cd8b549d1a7487d2f1ae7f9878856c76f0a82837 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Oct 13 15:31:59 2016 -0400 add the compiled tun2socks lib for devs who just want to work on UI --- orbotservice/src/main/jniLibs/armeabi/libtun2socks.so | Bin 0 -> 129472 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/orbotservice/src/main/jniLibs/armeabi/libtun2socks.so b/orbotservice/src/main/jniLibs/armeabi/libtun2socks.so new file mode 100755 index 0000000..74d7c34 Binary files /dev/null and b/orbotservice/src/main/jniLibs/armeabi/libtun2socks.so differ

1 0

[orbot/master] modify jni build inclusion
by n8fr8＠torproject.org 13 Oct '16

13 Oct '16

commit 34c7cfd2e1b159329d11821598e05f22a3a4e5ae Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Sep 29 12:00:26 2016 -0400 modify jni build inclusion --- app/build.gradle | 3 --- orbotservice/build.gradle | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4b7c1b0..05932ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,8 +4,6 @@ android { compileSdkVersion 23 buildToolsVersion "23.0.2" - sourceSets.main.jni.srcDirs = [] - defaultConfig { applicationId "org.torproject.android" minSdkVersion 9 @@ -22,7 +20,6 @@ android { } dependencies { - compile project(':jsocksAndroid') compile project(':orbotservice') compile 'com.android.support:support-v4:23.4.0' compile 'com.android.support:appcompat-v7:23.4.0' diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 34ddd60..d8296ba 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -4,6 +4,8 @@ android { compileSdkVersion 23 buildToolsVersion "23.0.3" + sourceSets.main.jni.srcDirs = [] + defaultConfig { minSdkVersion 9 targetSdkVersion 23 @@ -19,6 +21,7 @@ android { } dependencies { + compile project(':jsocksAndroid') compile 'com.android.support:appcompat-v7:23.+' compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12'

1 0