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

[orbot/master] update layout to present "Apps..." option on the main screen
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit 165e95a880d572cd83f35b5330787137246aa589 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 10:53:30 2017 -0400 update layout to present "Apps..." option on the main screen --- .../org/torproject/android/OrbotMainActivity.java | 6 ++ app/src/main/res/layout-land/layout_main.xml | 10 +++ app/src/main/res/layout/layout_main.xml | 81 +++++++++++++--------- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 67 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index b1e010a4..499fb25c 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -355,6 +355,12 @@ public class OrbotMainActivity extends AppCompatActivity }); + findViewById(R.id.btnApps).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + enableVPN(true); + } + }); } diff --git a/app/src/main/res/layout-land/layout_main.xml b/app/src/main/res/layout-land/layout_main.xml index 3ca1c5a4..fc8b2447 100644 --- a/app/src/main/res/layout-land/layout_main.xml +++ b/app/src/main/res/layout-land/layout_main.xml @@ -71,6 +71,16 @@ android:background="@drawable/rounded_button" android:layout_marginLeft="10dp" /> + <Button + android:id="@+id/btnApps" + android:layout_width="wrap_content" + android:layout_height="40dp" + android:text="@string/menu_apps" + android:ellipsize="end" + android:singleLine="true" + android:background="@drawable/rounded_button" + android:layout_marginLeft="10dp" + /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index 5edfc32b..f854db5d 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -36,7 +36,8 @@ android:orientation="vertical" android:layout_centerVertical="true" android:layout_alignParentLeft="true" - android:layout_alignParentStart="true"> + android:layout_alignParentStart="true" + android:weightSum="1"> <org.torproject.android.ui.ImageProgressView android:id="@+id/imgStatus" android:layout_width="match_parent" @@ -48,33 +49,6 @@ - <LinearLayout android:gravity="center_horizontal" - android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" - - > - <Button - android:layout_width="wrap_content" - android:layout_height="40dp" - android:text="@string/menu_start" - android:id="@+id/btnStart" - android:background="@drawable/rounded_button" - - /> - - - <Button - android:id="@+id/btnBrowser" - android:layout_width="wrap_content" - android:layout_height="40dp" - android:text="@string/menu_browse" - android:ellipsize="end" - android:singleLine="true" - android:background="@drawable/rounded_button" - android:layout_marginLeft="10dp" - /> - </LinearLayout> - </LinearLayout> @@ -84,16 +58,61 @@ android:layout_height="wrap_content" android:textSize="14sp" android:fontFamily="sans-serif-light" - android:text="" + android:text="asdasd" android:lines="1" android:maxLines="1" android:layout_margin="12dp" - android:layout_alignParentBottom="true" + android:layout_above="@+id/button_row" android:gravity="center" android:ellipsize="end" /> - </RelativeLayout> + + <LinearLayout + android:id="@+id/button_row" + android:gravity="center_horizontal|bottom" + android:layout_gravity="bottom" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_alignParentBottom="true" + android:layout_margin="6dp" + android:layout_height="wrap_content" + + > + <Button + android:layout_width="wrap_content" + android:layout_height="40dp" + android:text="@string/menu_start" + android:id="@+id/btnStart" + android:background="@drawable/rounded_button" + + /> + + + <Button + android:id="@+id/btnBrowser" + android:layout_width="wrap_content" + android:layout_height="40dp" + android:text="@string/menu_browse" + android:ellipsize="end" + android:maxLines="1" + android:background="@drawable/rounded_button" + android:layout_marginLeft="10dp" + /> + <Button + android:id="@+id/btnApps" + android:layout_width="wrap_content" + android:layout_height="40dp" + android:text="@string/menu_apps" + android:ellipsize="end" + android:maxLines="1" + android:background="@drawable/rounded_button" + android:layout_marginLeft="10dp" + /> + </LinearLayout> + + +</RelativeLayout> <LinearLayout diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d4636eda..90fc3e4c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,7 +21,7 @@ <string name="menu_settings">Settings</string> <string name="menu_log">Log</string> <string name="menu_info">Help</string> - <string name="menu_apps">VPN</string> + <string name="menu_apps">Apps...</string> <string name="menu_start">Start</string> <string name="menu_stop">Stop</string> <string name="menu_about">About</string>

1 0

[orbot/master] update tor to 0.3.1.8
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit dc7aee1e8e49e66cd228138bbf98ec3fcf935096 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 10:32:30 2017 -0400 update tor to 0.3.1.8 --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index 6babd3d9..ad5027f7 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit 6babd3d9ba9318b38b5af7278875efe84055a1b0 +Subproject commit ad5027f7dc790624353ecd57796f572d5b55fa4c

1 0

[orbot/master] show warning about removal of transproxy support
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit 440290e9d7b3796d2ee72381cd865e677c8b1081 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 00:07:11 2017 -0400 show warning about removal of transproxy support - also make app selection more streamlining --- .../main/java/org/torproject/android/OrbotApp.java | 55 ++++ .../org/torproject/android/OrbotMainActivity.java | 11 +- .../java/org/torproject/android/ui/AppManager.java | 315 ++++++++++----------- app/src/main/res/layout/layout_apps.xml | 68 +---- app/src/main/res/layout/layout_apps_item.xml | 27 +- app/src/main/res/values/strings.xml | 3 + .../android/service/TorServiceConstants.java | 3 - .../org/torproject/android/service/util/Prefs.java | 4 + 8 files changed, 243 insertions(+), 243 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java index e6fd014d..9ebcfa2b 100644 --- a/app/src/main/java/org/torproject/android/OrbotApp.java +++ b/app/src/main/java/org/torproject/android/OrbotApp.java @@ -1,21 +1,32 @@ package org.torproject.android; +import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.Activity; import android.app.Application; +import android.app.Notification; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.content.res.Configuration; import android.net.VpnService; import android.os.Build; +import android.support.v4.app.NotificationCompat; import android.util.Log; +import android.widget.RemoteViews; import org.torproject.android.service.OrbotConstants; +import org.torproject.android.service.TorEventHandler; +import org.torproject.android.service.TorService; import org.torproject.android.service.util.Prefs; import org.torproject.android.settings.Languages; import java.util.Locale; +import java.util.Set; public class OrbotApp extends Application implements OrbotConstants { @@ -30,6 +41,7 @@ public class OrbotApp extends Application implements OrbotConstants Languages.setup(OrbotMainActivity.class, R.string.menu_settings); Languages.setLanguage(this, Prefs.getDefaultLocale(), true); + checkTransparentProxyingLegacy(); } @Override @@ -53,4 +65,47 @@ public class OrbotApp extends Application implements OrbotConstants public static Languages getLanguages(Activity activity) { return Languages.get(activity); } + + private void checkTransparentProxyingLegacy () + { + if (Prefs.useTransparentProxying()) + { + showToolbarNotification(getString(R.string.no_transproxy_warning_short),getString(R.string.no_transproxy_warning), 9999, org.torproject.android.service.R.drawable.ic_stat_notifyerr); + + } + } + + @SuppressLint("NewApi") + protected void showToolbarNotification (String shortMsg, String notifyMsg, int notifyId, int icon) + { + + NotificationCompat.Builder notifyBuilder; + + //Reusable code. + PackageManager pm = getPackageManager(); + Intent intent = pm.getLaunchIntentForPackage(getPackageName()); + PendingIntent pendIntent = PendingIntent.getActivity(this, 0, intent, 0); + + NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + + notifyBuilder = new NotificationCompat.Builder(this) + .setContentTitle(getString(org.torproject.android.service.R.string.app_name)); + + + notifyBuilder.setContentIntent(pendIntent); + + notifyBuilder.setContentText(shortMsg); + notifyBuilder.setSmallIcon(icon); + notifyBuilder.setTicker(notifyMsg); + + notifyBuilder.setOngoing(false); + + notifyBuilder.setStyle(new NotificationCompat.BigTextStyle() + .bigText(notifyMsg).setBigContentTitle(getString(org.torproject.android.service.R.string.app_name))); + + Notification notification = notifyBuilder.build(); + + notificationManager.notify(notifyId, notification); + } + } diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 354b4a05..b1e010a4 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -852,10 +852,6 @@ public class OrbotMainActivity extends AppCompatActivity //use the system browser since VPN is on startIntent(null,Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); } - else if (Prefs.useTransparentProxying()) - { - startIntent(null,Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); - } else { AlertDialog aDialog = new AlertDialog.Builder(OrbotMainActivity.this) @@ -1172,6 +1168,13 @@ public class OrbotMainActivity extends AppCompatActivity requestTorStatus(); updateStatus(null); + + if (Prefs.useTransparentProxying()) + { + showAlert(getString(R.string.no_transproxy_warning_short),getString(R.string.no_transproxy_warning),true); + Prefs.disableTransparentProxying(); + } + } diff --git a/app/src/main/java/org/torproject/android/ui/AppManager.java b/app/src/main/java/org/torproject/android/ui/AppManager.java index 803061d3..e54898de 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManager.java +++ b/app/src/main/java/org/torproject/android/ui/AppManager.java @@ -15,16 +15,20 @@ import org.torproject.android.R; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.vpn.TorifiedApp; +import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; @@ -34,6 +38,7 @@ import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.GridView; import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ListView; @@ -41,112 +46,95 @@ import android.widget.TextView; public class AppManager extends AppCompatActivity implements OnCheckedChangeListener, OnClickListener, OrbotConstants { - private ListView listApps; + private GridView listApps; private final static String TAG = "Orbot"; - + PackageManager pMgr = null; + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + + pMgr = getPackageManager(); + this.setContentView(R.layout.layout_apps); setTitle(R.string.apps_mode); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - View buttonSelectAll, buttonSelectNone, buttonInvert; - buttonSelectAll = findViewById(R.id.button_proxy_all); - buttonSelectNone = findViewById(R.id.button_proxy_none); - buttonInvert = findViewById(R.id.button_invert_selection); - - buttonSelectAll.setOnClickListener(new OnAutoClickListener(0)); - buttonSelectNone.setOnClickListener(new OnAutoClickListener(1)); - buttonInvert.setOnClickListener(new OnAutoClickListener(2)); } - class OnAutoClickListener implements Button.OnClickListener { - private int status; - public OnAutoClickListener(int status){ - this.status = status; - } - @SuppressWarnings("unchecked") - public void onClick(View button){ - ListView listView; - ViewGroup viewGroup; - View parentView, currentView; - ArrayAdapter<TorifiedApp> adapter; - TorifiedApp app; - CheckBox box; - float buttonId; - boolean[] isSelected; - int posI, selectedI, lvSz; - - buttonId = button.getId(); - listView = (ListView) findViewById(R.id.applistview); - lvSz = listView.getCount(); - isSelected = new boolean[lvSz]; - - selectedI = -1; - - if (this.status == 0){ - Log.d(TAG, "Proxifying ALL"); - }else if (this.status == 1){ - Log.d(TAG, "Proxifying NONE"); - }else { - Log.d(TAG, "Proxifying invert"); - } - - Context context = getApplicationContext(); - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context); - ArrayList<TorifiedApp> apps = getApps(context, prefs); - parentView = (View) findViewById(R.id.applistview); - viewGroup = (ViewGroup) listView; - - adapter = (ArrayAdapter<TorifiedApp>) listApps.getAdapter(); - if (adapter == null){ - Log.w(TAG, "List adapter is null. Getting apps."); - loadApps(prefs); - adapter = (ArrayAdapter<TorifiedApp>) listApps.getAdapter(); - } - - for (int i = 0 ; i < adapter.getCount(); ++i){ - app = (TorifiedApp) adapter.getItem(i); - currentView = adapter.getView(i, parentView, viewGroup); - box = (CheckBox) currentView.findViewById(R.id.itemcheck); - - if (this.status == 0){ - app.setTorified(true); - }else if (this.status == 1){ - app.setTorified(false); - }else { - app.setTorified(!app.isTorified()); - } - - if (box != null) - box.setChecked(app.isTorified()); - - } - saveAppSettings(context); - loadApps(prefs); - } - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - setResult(RESULT_OK); - finish(); - return true; - + /** + class OnAutoClickListener implements Button.OnClickListener { + private int status; + public OnAutoClickListener(int status){ + this.status = status; + } + @SuppressWarnings("unchecked") + public void onClick(View button){ + GridView listView; + ViewGroup viewGroup; + View parentView, currentView; + ArrayAdapter<TorifiedApp> adapter; + TorifiedApp app; + CheckBox box; + float buttonId; + boolean[] isSelected; + int posI, selectedI, lvSz; + + buttonId = button.getId(); + listView = (GridView) findViewById(R.id.applistview); + lvSz = listView.getCount(); + isSelected = new boolean[lvSz]; + + selectedI = -1; + + if (this.status == 0){ + Log.d(TAG, "Proxifying ALL"); + }else if (this.status == 1){ + Log.d(TAG, "Proxifying NONE"); + }else { + Log.d(TAG, "Proxifying invert"); + } + + Context context = getApplicationContext(); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context); + ArrayList<TorifiedApp> apps = getApps(context, prefs); + parentView = (View) findViewById(R.id.applistview); + viewGroup = (ViewGroup) listView; + + adapter = (ArrayAdapter<TorifiedApp>) listApps.getAdapter(); + if (adapter == null){ + Log.w(TAG, "List adapter is null. Getting apps."); + loadApps(prefs); + adapter = (ArrayAdapter<TorifiedApp>) listApps.getAdapter(); + } + + for (int i = 0 ; i < adapter.getCount(); ++i){ + app = (TorifiedApp) adapter.getItem(i); + currentView = adapter.getView(i, parentView, viewGroup); + box = (CheckBox) currentView.findViewById(R.id.itemcheck); + + if (this.status == 0){ + app.setTorified(true); + }else if (this.status == 1){ + app.setTorified(false); + }else { + app.setTorified(!app.isTorified()); + } + + if (box != null) + box.setChecked(app.isTorified()); + + } + saveAppSettings(context); + loadApps(prefs); + } + }**/ - } - return false; - } @Override protected void onResume() { super.onResume(); - listApps = (ListView)findViewById(R.id.applistview); + listApps = (GridView)findViewById(R.id.applistview); mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); loadApps(mPrefs); @@ -154,12 +142,12 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList SharedPreferences mPrefs = null; ArrayList<TorifiedApp> mApps = null; - + private void loadApps (SharedPreferences prefs) { - + mApps = getApps(getApplicationContext(), prefs); - + /* Arrays.sort(apps, new Comparator<TorifiedApp>() { public int compare(TorifiedApp o1, TorifiedApp o2) { @@ -168,9 +156,9 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList return 1; } });*/ - + final LayoutInflater inflater = getLayoutInflater(); - + ListAdapter adapter = new ArrayAdapter<TorifiedApp>(this, R.layout.layout_apps_item, R.id.itemtext,mApps) { public View getView(int position, View convertView, ViewGroup parent) { @@ -198,16 +186,23 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList final TorifiedApp app = mApps.get(position); if (entry.icon != null) { - if (app.getIcon() != null) - entry.icon.setImageDrawable(app.getIcon()); - else - entry.icon.setVisibility(View.GONE); + + try { + entry.icon.setImageDrawable(pMgr.getApplicationIcon(app.getPackageName())); + entry.icon.setOnClickListener(AppManager.this); + + if (entry.box != null) + entry.icon.setTag(entry.box); + } + catch (Exception e) + { + e.printStackTrace(); + } } if (entry.text != null) { entry.text.setText(app.getName()); entry.text.setOnClickListener(AppManager.this); - entry.text.setOnClickListener(AppManager.this); if (entry.box != null) entry.text.setTag(entry.box); @@ -219,39 +214,38 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList entry.box.setTag(app); entry.box.setChecked(app.isTorified()); - } return convertView; } }; - + listApps.setAdapter(adapter); - + } - + private static class ListEntry { private CheckBox box; private TextView text; private ImageView icon; } - + /* (non-Javadoc) * @see android.app.Activity#onStop() */ @Override protected void onStop() { super.onStop(); - + } - - public static ArrayList<TorifiedApp> getApps (Context context, SharedPreferences prefs) + + public ArrayList<TorifiedApp> getApps (Context context, SharedPreferences prefs) { String tordAppString = prefs.getString(PREFS_KEY_TORIFIED, ""); String[] tordApps; - + StringTokenizer st = new StringTokenizer(tordAppString,"|"); tordApps = new String[st.countTokens()]; int tordIdx = 0; @@ -259,32 +253,31 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList { tordApps[tordIdx++] = st.nextToken(); } - + Arrays.sort(tordApps); //else load the apps up - PackageManager pMgr = context.getPackageManager(); - + List<ApplicationInfo> lAppInfo = pMgr.getInstalledApplications(0); - + Iterator<ApplicationInfo> itAppInfo = lAppInfo.iterator(); - + ArrayList<TorifiedApp> apps = new ArrayList<TorifiedApp>(); - + ApplicationInfo aInfo = null; - + int appIdx = 0; TorifiedApp app = null; - + while (itAppInfo.hasNext()) { aInfo = itAppInfo.next(); - + app = new TorifiedApp(); - + try { PackageInfo pInfo = pMgr.getPackageInfo(aInfo.packageName, PackageManager.GET_PERMISSIONS); - + if (pInfo != null && pInfo.requestedPermissions != null) { for (String permInfo:pInfo.requestedPermissions) @@ -292,51 +285,51 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList if (permInfo.equals("android.permission.INTERNET")) { app.setUsesInternet(true); - + } } - + } - - + + } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } - - if ((aInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1) + + /** + if ((aInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1) + { + //System app + app.setUsesInternet(true); + }**/ + + + try + { + app.setName(pMgr.getApplicationLabel(aInfo).toString()); + } + catch (Exception e) { - //System app - app.setUsesInternet(true); - } - - + // no name + continue; //we only show apps with names + } + + if (!app.usesInternet()) continue; else { apps.add(app); } - - + app.setEnabled(aInfo.enabled); app.setUid(aInfo.uid); app.setUsername(pMgr.getNameForUid(app.getUid())); app.setProcname(aInfo.processName); app.setPackageName(aInfo.packageName); - - try - { - app.setName(pMgr.getApplicationLabel(aInfo).toString()); - } - catch (Exception e) - { - app.setName(aInfo.packageName); - } - - - //app.setIcon(pMgr.getApplicationIcon(aInfo)); - + + // check if this application is allowed if (Arrays.binarySearch(tordApps, app.getUsername()) >= 0) { app.setTorified(true); @@ -345,15 +338,15 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList { app.setTorified(false); } - + appIdx++; } - + Collections.sort(apps); - + return apps; } - + public void saveAppSettings (Context context) { @@ -368,13 +361,13 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList tordApps.append("|"); } } - + Editor edit = mPrefs.edit(); edit.putString(PREFS_KEY_TORIFIED, tordApps.toString()); edit.commit(); - + } - + /** * Called an application is check/unchecked @@ -384,29 +377,29 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList if (app != null) { app.setTorified(isChecked); } - + saveAppSettings(this); } - + public void onClick(View v) { - + CheckBox cbox = (CheckBox)v.getTag(); - + final TorifiedApp app = (TorifiedApp)cbox.getTag(); if (app != null) { app.setTorified(!app.isTorified()); cbox.setChecked(app.isTorified()); } - + saveAppSettings(this); - + } - + } diff --git a/app/src/main/res/layout/layout_apps.xml b/app/src/main/res/layout/layout_apps.xml index 33e07485..b036503f 100644 --- a/app/src/main/res/layout/layout_apps.xml +++ b/app/src/main/res/layout/layout_apps.xml @@ -1,69 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - xmlns:android="http://schemas.android.com/apk/res/android" - android:duplicateParentState="true"> - -  + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:android="http://schemas.android.com/apk/res/android" + android:duplicateParentState="true"> - <ListView + <GridView android:id="@+id/applistview" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@+id/layout_button_filters" + android:numColumns="3" android:layout_alignParentTop="true" > - </ListView> - - <LinearLayout - android:id="@+id/layout_button_filters" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:orientation="horizontal" > - - <android.support.v7.widget.AppCompatImageButton - android:id="@+id/button_proxy_all" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_toLeftOf="@+id/button_proxy_none" - android:layout_toStartOf="@+id/button_proxy_none" - - android:layout_weight="1" - android:src="@drawable/ic_playlist_add_check_black_36dp"/> - - <android.support.v7.widget.AppCompatImageButton - android:id="@+id/button_invert_selection" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:layout_alignParentTop="true" - - android:layout_weight="1" - android:src="@drawable/ic_autorenew_black_36dp"/> - - <android.support.v7.widget.AppCompatImageButton - android:id="@+id/button_proxy_none" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_weight="1" - android:layout_toLeftOf="@+id/button_invert_selection" - android:layout_toStartOf="@+id/button_invert_selection" - android:src='@drawable/ic_filter_none_black_36dp' /> - - </LinearLayout> + </GridView> -</RelativeLayout> +</RelativeLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_apps_item.xml b/app/src/main/res/layout/layout_apps_item.xml index e1240139..83549121 100644 --- a/app/src/main/res/layout/layout_apps_item.xml +++ b/app/src/main/res/layout/layout_apps_item.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<TableLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="40dp" - android:stretchColumns="1"> - <TableRow> - - <ImageView android:id="@+id/itemicon" android:layout_width="50dp" android:layout_height="50dp" android:padding="3dp" android:visibility="gone"></ImageView> - -<TextView android:layout_height="wrap_content" android:layout_width="150dp" android:id="@+id/itemtext" android:text="uid:packages" android:textSize="18sp" android:padding="3dip"></TextView> - -<CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/itemcheck" ></CheckBox> - - </TableRow> - -</TableLayout> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="120dp" + android:layout_height="120dp" + android:orientation="vertical" + android:gravity="center_horizontal" + > + <ImageView android:id="@+id/itemicon" android:layout_width="50dp" android:layout_height="50dp" android:padding="3dp" ></ImageView> + <TextView android:layout_height="20dp" android:layout_width="120dp" android:lines="1" android:id="@+id/itemtext" + android:text="uid:packages" android:textSize="12sp" android:gravity="center_horizontal" android:padding="3dip"></TextView> + <CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/itemcheck" ></CheckBox> + +</LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c23e5507..d4636eda 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -380,4 +380,7 @@ <string name="enable">Enable</string> <string name="consider_disable_battery_optimizations">Consider disable battery optimizations</string> <string name="consider_enable_battery_optimizations">Consider enable battery optimizations</string> + + <string name="no_transproxy_warning_short">WARNING: Transproxying no longer supported</string> + <string name="no_transproxy_warning">WARNING: Transparent proxying not supported. Use Orbot Apps VPN instead.</string> </resources> 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 32bd9045..a757159d 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -142,9 +142,6 @@ public interface TorServiceConstants { public static final String OBFSCLIENT_ASSET_KEY = "obfs4proxy"; // public static final String MEEK_ASSET_KEY = "meek-client"; - - //name of the iptables binary - public final static String IPTABLES_ASSET_KEY = "xtables"; //DNS daemon for TCP DNS over TOr public final static String PDNSD_ASSET_KEY = "pdnsd"; diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index cf3489e6..9ceec989 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -76,6 +76,10 @@ public class Prefs { return prefs.getBoolean(PREF_TRANSPARENT, false); } + public static void disableTransparentProxying() { + prefs.getBoolean(PREF_TRANSPARENT, false); + } + public static boolean transparentProxyAll() { return prefs.getBoolean(PREF_TRANSPARENT_ALL, false); }

1 0

[orbot/master] we no longer ship xtables, so don't try to install it
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit 9140ba6a4751842e32b7fcdb285bbb59e8d7e0ef Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 00:06:58 2017 -0400 we no longer ship xtables, so don't try to install it --- .../org/torproject/android/service/util/TorResourceInstaller.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/TorResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/util/TorResourceInstaller.java index 36369aac..8e2a6e02 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/TorResourceInstaller.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/TorResourceInstaller.java @@ -101,11 +101,6 @@ public class TorResourceInstaller implements TorServiceConstants { streamToFile(is,outFile, false, true); setExecutable(outFile); - is = context.getAssets().open(cpuPath + '/' + IPTABLES_ASSET_KEY + MP3_EXT); - outFile = new File(installFolder, IPTABLES_ASSET_KEY); - streamToFile(is,outFile, false, true); - setExecutable(outFile); - is = context.getAssets().open(cpuPath + '/' + PDNSD_ASSET_KEY + MP3_EXT); outFile = new File(installFolder, PDNSD_ASSET_KEY); streamToFile(is,outFile, false, true);

1 0

[orbot/master] update to Tor 0.3.1.8-openssl1.0.2k
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit d24aab8b47649338620a15affcffb1b7e99361c8 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 10:54:10 2017 -0400 update to Tor 0.3.1.8-openssl1.0.2k --- .../main/java/org/torproject/android/service/TorServiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a757159d..d199eec6 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -135,7 +135,7 @@ 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.3.1.7-openssl1.0.2k"; + public static final String BINARY_TOR_VERSION = "0.3.1.8-openssl1.0.2k"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[orbot/master] clean up variables and improve how tor process is launched
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit 091037427af76f7bbb2c79e809bb77f8c42de323 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 11:41:55 2017 -0400 clean up variables and improve how tor process is launched --- .../org/torproject/android/service/TorService.java | 47 +++---- .../android/service/TorServiceConstants.java | 140 ++++++++++----------- 2 files changed, 95 insertions(+), 92 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 36c1b229..8e5a7495 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -675,13 +675,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (Prefs.useVpn()) extraLines.append("DNSListenAddress 0.0.0.0").append('\n'); - - if (Prefs.transparentTethering()) - { - extraLines.append("TransListenAddress 0.0.0.0").append('\n'); - extraLines.append("DNSListenAddress 0.0.0.0").append('\n'); - } - + extraLines.append("VirtualAddrNetwork 10.192.0.0/10").append('\n'); extraLines.append("AutomapHostsOnResolve 1").append('\n'); @@ -866,26 +860,32 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon + " -f " + torrcPath + ".custom"; debug(torCmdString); - - int exitCode = exec(torCmdString + " --verify-config", true); - String output = ""; - // String output = shellTorCommand.getOutput(); - - if (exitCode != 0) + + int exitCode = -1; + + try { + exitCode = exec(torCmdString + " --verify-config", true); + } + catch (Exception e) { - logNotice("Tor (" + exitCode + "): " + output); - throw new Exception ("Torrc config did not verify"); - + logNotice("Tor configuration did not verify: " + e.getMessage()); + return false; + } + + + try { + exitCode = exec(torCmdString, true); + } + catch (Exception e) + { + logNotice("Tor was unable to start: " + e.getMessage()); + return false; } - exitCode = exec(torCmdString, true); - output = "";// shellTorCommand.getOutput(); - if (exitCode != 0) { - logNotice("Tor (" + exitCode + "): " + output); - //throw new Exception ("unable to start"); + logNotice("Tor did not start. Exit:" + exitCode); return false; } @@ -918,9 +918,12 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private int exec (String cmd, boolean wait) throws Exception { CommandResult shellResult = Shell.run(cmd); - shellResult.isSuccessful(); debug("CMD: " + cmd + "; SUCCESS=" + shellResult.isSuccessful()); + if (!shellResult.isSuccessful()) { + throw new Exception("Error: " + shellResult.exitCode + " ERR=" + shellResult.getStderr() + " OUT=" + shellResult.getStdout()); + } + /** SimpleCommand command = new SimpleCommand(cmd); mShell.add(command); 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 d199eec6..b91f2b2d 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -7,150 +7,150 @@ import android.content.Intent; public interface TorServiceConstants { - public final static String TOR_APP_USERNAME = "org.torproject.android"; - public final static String BROWSER_APP_USERNAME = "info.guardianproject.orfox"; + String TOR_APP_USERNAME = "org.torproject.android"; + String BROWSER_APP_USERNAME = "info.guardianproject.orfox"; - public final static String DIRECTORY_TOR_BINARY = "bin"; - public final static String DIRECTORY_TOR_DATA = "data"; + String DIRECTORY_TOR_BINARY = "bin"; + String DIRECTORY_TOR_DATA = "data"; //name of the tor C binary - public final static String TOR_ASSET_KEY = "tor"; + String TOR_ASSET_KEY = "tor"; //torrc (tor config file) - public final static String TORRC_ASSET_KEY = "torrc"; - public final static String TORRCDIAG_ASSET_KEY = "torrcdiag"; - public final static String TORRC_TETHER_KEY = "torrctether"; + String TORRC_ASSET_KEY = "torrc"; + String TORRCDIAG_ASSET_KEY = "torrcdiag"; + String TORRC_TETHER_KEY = "torrctether"; - public final static String TOR_CONTROL_COOKIE = "control_auth_cookie"; + String TOR_CONTROL_COOKIE = "control_auth_cookie"; //privoxy - public final static String POLIPO_ASSET_KEY = "polipo"; + String POLIPO_ASSET_KEY = "polipo"; //privoxy.config - public final static String POLIPOCONFIG_ASSET_KEY = "torpolipo.conf"; + String POLIPOCONFIG_ASSET_KEY = "torpolipo.conf"; //geoip data file asset key - public final static String GEOIP_ASSET_KEY = "geoip"; - public final static String GEOIP6_ASSET_KEY = "geoip6"; + String GEOIP_ASSET_KEY = "geoip"; + String GEOIP6_ASSET_KEY = "geoip6"; //various console cmds - public final static String SHELL_CMD_CHMOD = "chmod"; - public final static String SHELL_CMD_KILL = "kill -9"; - public final static String SHELL_CMD_RM = "rm"; - public final static String SHELL_CMD_PS = "toolbox ps"; - public final static String SHELL_CMD_PS_ALT = "ps"; + String SHELL_CMD_CHMOD = "chmod"; + String SHELL_CMD_KILL = "kill -9"; + String SHELL_CMD_RM = "rm"; + String SHELL_CMD_PS = "toolbox ps"; + String SHELL_CMD_PS_ALT = "ps"; - //public final static String SHELL_CMD_PIDOF = "pidof"; - public final static String SHELL_CMD_LINK = "ln -s"; - public final static String SHELL_CMD_CP = "cp"; + //String SHELL_CMD_PIDOF = "pidof"; + String SHELL_CMD_LINK = "ln -s"; + String SHELL_CMD_CP = "cp"; - public final static String CHMOD_EXE_VALUE = "770"; + String CHMOD_EXE_VALUE = "770"; - public final static int FILE_WRITE_BUFFER_SIZE = 1024; + int FILE_WRITE_BUFFER_SIZE = 1024; - public final static String IP_LOCALHOST = "127.0.0.1"; - public final static int UPDATE_TIMEOUT = 1000; - public final static int TOR_TRANSPROXY_PORT_DEFAULT = 9040; + String IP_LOCALHOST = "127.0.0.1"; + int UPDATE_TIMEOUT = 1000; + int TOR_TRANSPROXY_PORT_DEFAULT = 9040; - public final static int STANDARD_DNS_PORT = 53; - public final static int TOR_DNS_PORT_DEFAULT = 5400; - public final static String TOR_VPN_DNS_LISTEN_ADDRESS = "127.0.0.1"; + int STANDARD_DNS_PORT = 53; + int TOR_DNS_PORT_DEFAULT = 5400; + String TOR_VPN_DNS_LISTEN_ADDRESS = "127.0.0.1"; - public final static int CONTROL_PORT_DEFAULT = 9051; - public final static int HTTP_PROXY_PORT_DEFAULT = 8118; // like Privoxy! - public final static int SOCKS_PROXY_PORT_DEFAULT = 9050; + int CONTROL_PORT_DEFAULT = 9051; + int HTTP_PROXY_PORT_DEFAULT = 8118; // like Privoxy! + int SOCKS_PROXY_PORT_DEFAULT = 9050; //path to check Tor against - public final static String URL_TOR_CHECK = "https://check.torproject.org"; + String URL_TOR_CHECK = "https://check.torproject.org"; //control port - public final static String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = "Bootstrapped 100%"; - public final static String LOG_NOTICE_HEADER = "NOTICE"; - public final static String LOG_NOTICE_BOOTSTRAPPED = "Bootstrapped"; + String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = "Bootstrapped 100%"; + String LOG_NOTICE_HEADER = "NOTICE"; + String LOG_NOTICE_BOOTSTRAPPED = "Bootstrapped"; /** * A request to Orbot to transparently start Tor services */ - public final static String ACTION_START = "org.torproject.android.intent.action.START"; + String ACTION_START = "org.torproject.android.intent.action.START"; /** * {@link Intent} send by Orbot with {@code ON/OFF/STARTING/STOPPING} status */ - public final static String ACTION_STATUS = "org.torproject.android.intent.action.STATUS"; + String ACTION_STATUS = "org.torproject.android.intent.action.STATUS"; /** * {@code String} that contains a status constant: {@link #STATUS_ON}, * {@link #STATUS_OFF}, {@link #STATUS_STARTING}, or * {@link #STATUS_STOPPING} */ - public final static String EXTRA_STATUS = "org.torproject.android.intent.extra.STATUS"; + String EXTRA_STATUS = "org.torproject.android.intent.extra.STATUS"; /** * A {@link String} {@code packageName} for Orbot to direct its status reply * to, used in {@link #ACTION_START} {@link Intent}s sent to Orbot */ - public final static String EXTRA_PACKAGE_NAME = "org.torproject.android.intent.extra.PACKAGE_NAME"; + String EXTRA_PACKAGE_NAME = "org.torproject.android.intent.extra.PACKAGE_NAME"; /** * The SOCKS proxy settings in URL form. */ - public final static String EXTRA_SOCKS_PROXY = "org.torproject.android.intent.extra.SOCKS_PROXY"; - public final static String EXTRA_SOCKS_PROXY_HOST = "org.torproject.android.intent.extra.SOCKS_PROXY_HOST"; - public final static String EXTRA_SOCKS_PROXY_PORT = "org.torproject.android.intent.extra.SOCKS_PROXY_PORT"; + String EXTRA_SOCKS_PROXY = "org.torproject.android.intent.extra.SOCKS_PROXY"; + String EXTRA_SOCKS_PROXY_HOST = "org.torproject.android.intent.extra.SOCKS_PROXY_HOST"; + String EXTRA_SOCKS_PROXY_PORT = "org.torproject.android.intent.extra.SOCKS_PROXY_PORT"; /** * The HTTP proxy settings in URL form. */ - public final static String EXTRA_HTTP_PROXY = "org.torproject.android.intent.extra.HTTP_PROXY"; - public final static String EXTRA_HTTP_PROXY_HOST = "org.torproject.android.intent.extra.HTTP_PROXY_HOST"; - public final static String EXTRA_HTTP_PROXY_PORT = "org.torproject.android.intent.extra.HTTP_PROXY_PORT"; + String EXTRA_HTTP_PROXY = "org.torproject.android.intent.extra.HTTP_PROXY"; + String EXTRA_HTTP_PROXY_HOST = "org.torproject.android.intent.extra.HTTP_PROXY_HOST"; + String EXTRA_HTTP_PROXY_PORT = "org.torproject.android.intent.extra.HTTP_PROXY_PORT"; - public final static String LOCAL_ACTION_LOG = "log"; - public final static String LOCAL_ACTION_BANDWIDTH = "bandwidth"; - public final static String LOCAL_EXTRA_LOG = "log"; + String LOCAL_ACTION_LOG = "log"; + String LOCAL_ACTION_BANDWIDTH = "bandwidth"; + String LOCAL_EXTRA_LOG = "log"; /** * All tor-related services and daemons are stopped */ - public final static String STATUS_OFF = "OFF"; + String STATUS_OFF = "OFF"; /** * All tor-related services and daemons have completed starting */ - public final static String STATUS_ON = "ON"; - public final static String STATUS_STARTING = "STARTING"; - public final static String STATUS_STOPPING = "STOPPING"; + String STATUS_ON = "ON"; + String STATUS_STARTING = "STARTING"; + String STATUS_STOPPING = "STOPPING"; /** * The user has disabled the ability for background starts triggered by * apps. Fallback to the old {@link Intent} action that brings up Orbot: * {@link org.torproject.android.OrbotMainActivity#INTENT_ACTION_REQUEST_START_TOR} */ - public final static String STATUS_STARTS_DISABLED = "STARTS_DISABLED"; + String STATUS_STARTS_DISABLED = "STARTS_DISABLED"; // actions for internal command Intents - public static final String CMD_SIGNAL_HUP = "signal_hup"; - public static final String CMD_STATUS = "status"; - public static final String CMD_FLUSH = "flush"; - public static final String CMD_NEWNYM = "newnym"; - public static final String CMD_VPN = "vpn"; - public static final String CMD_VPN_CLEAR = "vpnclear"; - 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.3.1.8-openssl1.0.2k"; - public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; + String CMD_SIGNAL_HUP = "signal_hup"; + String CMD_STATUS = "status"; + String CMD_FLUSH = "flush"; + String CMD_NEWNYM = "newnym"; + String CMD_VPN = "vpn"; + String CMD_VPN_CLEAR = "vpnclear"; + String CMD_UPDATE_TRANS_PROXY = "update"; + String CMD_SET_EXIT = "setexit"; + + String BINARY_TOR_VERSION = "0.3.1.8-openssl1.0.2k"; + String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy - public static final String OBFSCLIENT_ASSET_KEY = "obfs4proxy"; + String OBFSCLIENT_ASSET_KEY = "obfs4proxy"; - // public static final String MEEK_ASSET_KEY = "meek-client"; + // String MEEK_ASSET_KEY = "meek-client"; //DNS daemon for TCP DNS over TOr - public final static String PDNSD_ASSET_KEY = "pdnsd"; + String PDNSD_ASSET_KEY = "pdnsd"; //EXIT COUNTRY CODES - public final static String[] COUNTRY_CODES = {"DE","AT","SE","CH","IS","CA","US","ES","FR","BG","PL","AU","BR","CZ","DK","FI","GB","HU","NL","JP","RO","RU","SG","SK"}; + String[] COUNTRY_CODES = {"DE","AT","SE","CH","IS","CA","US","ES","FR","BG","PL","AU","BR","CZ","DK","FI","GB","HU","NL","JP","RO","RU","SG","SK"}; - public static final String HIDDEN_SERVICES_DIR = "hidden_services"; + String HIDDEN_SERVICES_DIR = "hidden_services";

1 0

[orbot/master] improve the layout!
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit e1ba02a426085aa8af364930b220ac1d7d1f29c7 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 11:42:36 2017 -0400 improve the layout! --- app/src/main/res/layout/layout_main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index f854db5d..030257cf 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:textSize="14sp" android:fontFamily="sans-serif-light" - android:text="asdasd" + android:text="" android:lines="1" android:maxLines="1" android:layout_margin="12dp"

1 0

[orbot/master] remove unsupported preferences
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit a685bf148817546ee2f6cb69dfd75d1facb76a77 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 11:42:26 2017 -0400 remove unsupported preferences --- .../android/settings/SettingsPreferences.java | 9 --------- app/src/main/res/xml/preferences.xml | 17 ++--------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java index 9078b100..74986779 100644 --- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java +++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java @@ -28,7 +28,6 @@ public class SettingsPreferences extends PreferenceActivity implements OnPreferenceClickListener { private static final String TAG = "SettingsPreferences"; - private Preference prefTransProxyApps = null; private ListPreference prefLocale = null; protected void onCreate(Bundle savedInstanceState) { @@ -65,14 +64,6 @@ public class SettingsPreferences }); - prefTransProxyApps = findPreference("pref_transparent_app_list"); - prefTransProxyApps.setOnPreferenceClickListener(this); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) - { - prefTransProxyApps.setEnabled(true); - } - } diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index c20dc4fa..995fbbee 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -35,7 +35,7 @@ android:title="@string/pref_allow_background_starts_title"/> </ListPreference> </PreferenceCategory> - + <PreferenceCategory android:title="@string/pref_node_configuration" android:summary="@string/pref_node_configuration_summary"> @@ -225,13 +225,6 @@ android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_v android:enabled="true"></CheckBoxPreference> -<CheckBoxPreference -android:defaultValue="false" -android:key="pref_use_sys_iptables" -android:summary="@string/pref_use_sys_iptables_summary" -android:enabled="true" -android:title="@string/pref_use_sys_iptables_title"/> - <CheckBoxPreference android:defaultValue="true" @@ -240,12 +233,6 @@ android:summary="@string/pref_disable_network_summary" android:enabled="true" android:title="@string/pref_disable_network_title"/> -<CheckBoxPreference -android:defaultValue="false" -android:key="pref_transproxy_refresh" -android:summary="@string/pref_transproxy_refresh_summary" -android:enabled="true" -android:title="@string/pref_transproxy_refresh_title"/> <Preference android:key="pref_transproxy_flush"

1 0

[orbot/master] updating this to 15.5.0-RC-1-multi-SDK16
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit eff2f765db858c1a1d49e7a969ce40e06702fcec Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 11:46:15 2017 -0400 updating this to 15.5.0-RC-1-multi-SDK16 in lite of the feature enhancements and new version of tor --- app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 10406fc0..d8da8a1a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,15 +26,15 @@ android { applicationId 'org.torproject.android' targetSdkVersion 23 maxSdkVersion 23 - versionCode 15440002 - versionName '15.4.4-BETA-2-multi-SDK16' + versionCode 15500000 + versionName '15.5.0-RC-1-multi-SDK16' } fullperm { minSdkVersion 23 applicationId 'org.torproject.android' targetSdkVersion 25 - versionCode 15440003 - versionName '15.4.3-BETA-2-multi-SDK23' + versionCode 15500001 + versionName '15.5.0-RC-1-multi-SDK23' } } }

1 0

[orbot/master] update changelog for v15.4.4
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit aa9ed7fbe9c79da8eccd007f0723523c6ba165fc Author: n8fr8 <nathan(a)freitas.net> Date: Wed Oct 25 11:44:54 2017 -0400 update changelog for v15.4.4 --- CHANGELOG | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d33399f8..eb48da1c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,37 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** v15.4.4 / 28 Oct 2017 / 032321656999543ab160f9739ca175d790bbd974 **/ + +0323216 update to 15.4.4-BETA-2-multi-SDK16 +e1ba02a improve the layout! +a685bf1 remove unsupported preferences +0910374 clean up variables and improve how tor process is launched +d24aab8 update to Tor 0.3.1.8-openssl1.0.2k +165e95a update layout to present "Apps..." option on the main screen +dc7aee1 update tor to 0.3.1.8 +440290e show warning about removal of transproxy support - also make app selection more streamlining +9140ba6 we no longer ship xtables, so don't try to install it +f09508d remove unused permission +e6003f6 update tor constants to 0.3.1.7-openssl1.0.2k +d86ace6 update version to 15.4.4-BETA-1 update gradle depends +90975fb update Makefile for tor compression options +25425a6 remove xtables and iptables (no more root support) +b0b6b68 tor-0.3.1.7 update +dceea11 update version 15430000 aka 15.4.3-RC-1-multi-SDK16 +b98a0ff simplify bridge selection screen +1e2074c update main activity to clean up intents +a5015dc update about layout to show obfs4proxy +b322e53 make sure receiver unregisters when destroyed +2bd5614 update to latest meek amazon bridge: https://trac.torproject.org/projects/tor/ticket/21918 +01176b1 big refactor for multiple reasons - implement LICENSE display in About dialog - remove root transproxy features - general crufty stuff cleanup +70693bf update to 4.9 NDK biuld +c4867ba update Makefile to target NDK 4.9 +6ca89b3 remove old manifest +cc3c451 update license for better Obfs4proxy display +632824b remove RootCommands library as we don't need it now +d190f3a add license asset for display in the app +ebc362c add copyright notice from Obfs4 in the LICENSE file +5b255df update target SDK to 23 so we don't have perm downgrade issues /** v15.4.2 / 9 June 2017 / e18a7937d271d7482d5eaac9900e1c06b4b48b89 **/

1 0