November 2014 - tor-commits - lists.torproject.org

[orbot/master] Merge branch 'master' of https://git.torproject.org/orbot
by n8fr8＠torproject.org 14 Nov '14

14 Nov '14

commit 3f4b76a17193a9d7c58eeb5401f87061bd92c3a4 Merge: d02c5ea 7d243af Author: Jordan <jordannh(a)sent.com> Date: Wed Aug 13 21:31:12 2014 -0700 Merge branch 'master' of https://git.torproject.org/orbot AndroidManifest.xml | 4 ++-- CHANGELOG | 2 ++ external/jtorctl | 2 +- src/org/torproject/android/service/TorService.java | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-)

1 0

[orbot/master] Add buttons to filter application selection.
by n8fr8＠torproject.org 14 Nov '14

14 Nov '14

commit 59b333984d05d3f23e8cbf34ad713d6432afd603 Author: Jordan <jordannh(a)sent.com> Date: Wed Aug 13 17:23:33 2014 -0700 Add buttons to filter application selection. --- res/layout/layout_apps.xml | 89 +++- res/values/strings.xml | 4 + .../torproject/android/settings/AppManager.java | 543 +++++++++++--------- 3 files changed, 376 insertions(+), 260 deletions(-) diff --git a/res/layout/layout_apps.xml b/res/layout/layout_apps.xml index ddd546d..d3633a0 100644 --- a/res/layout/layout_apps.xml +++ b/res/layout/layout_apps.xml @@ -1,19 +1,74 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:duplicateParentState="false"> - - - -<Button android:layout_width="fill_parent" - android:layout_height="wrap_content" android:id="@+id/btnsave" - android:text="@string/button_close" android:layout_alignParentBottom="true" /> - - <ListView android:layout_above="@id/btnsave" android:layout_alignParentTop="true" android:layout_width="fill_parent" android:layout_height="fill_parent" android:id="@+id/applistview"></ListView> +<RelativeLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:duplicateParentState="true"> + +  + + <ListView + android:id="@+id/applistview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/layout_button_filters" + android:layout_alignParentTop="true" > + + </ListView> + + <Button + android:id="@+id/btnsave" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:text="@string/button_close" /> + + <RelativeLayout + android:id="@+id/layout_button_filters" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/btnsave" + android:orientation="horizontal" > + + <Button + 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:text="@string/button_proxy_all" /> + + <Button + 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:text="@string/button_invert_selection" /> + + <Button + android:id="@+id/button_proxy_none" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_toLeftOf="@+id/button_invert_selection" + android:layout_toStartOf="@+id/button_invert_selection" + android:text="@string/button_proxy_none" /> + + </RelativeLayout> + </RelativeLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index fa4a731..36d043e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -134,6 +134,10 @@ <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> + <string name="button_proxy_all">Proxy All</string> + <string name="button_proxy_none">Proxy None</string> + <string name="button_invert_selection">Invert Selection</string> + <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string> <string name="pref_proxy_type_title">Outbound Proxy Type</string> diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index f43dd6f..88e2023 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -11,11 +11,14 @@ import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; + + import org.torproject.android.R; import org.torproject.android.TorConstants; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceUtils; +//import android.R; import android.app.Activity; import android.content.Context; import android.content.SharedPreferences; @@ -26,7 +29,11 @@ import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; import android.view.LayoutInflater; +import android.view.MenuItem.OnMenuItemClickListener; import android.view.View; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MenuInflater; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ArrayAdapter; @@ -41,275 +48,325 @@ import android.widget.TextView; public class AppManager extends Activity implements OnCheckedChangeListener, OnClickListener, TorConstants { - private ListView listApps; - - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - this.setContentView(R.layout.layout_apps); - + private ListView listApps; + + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + this.setContentView(R.layout.layout_apps); + + Button buttonSelectAll, buttonSelectNone, buttonInvert; - } - - - @Override - protected void onResume() { - super.onResume(); - listApps = (ListView)findViewById(R.id.applistview); + buttonSelectAll = (Button) findViewById(R.id.button_proxy_all); + buttonSelectNone = (Button) findViewById(R.id.button_proxy_none); + buttonInvert = (Button) findViewById(R.id.button_invert_selection); - Button btnSave = (Button)findViewById(R.id.btnsave); - btnSave.setOnClickListener(new OnClickListener() - { + buttonSelectAll.setOnClickListener(new Button.OnClickListener() { + @Override + public void onClick(View v) { + autoCheckApplications(v); + } + }); + buttonSelectNone.setOnClickListener(new Button.OnClickListener() { + @Override + public void onClick(View v) { + autoCheckApplications(v); + } + }); + buttonInvert.setOnClickListener(new Button.OnClickListener() { + @Override + public void onClick(View v) { + autoCheckApplications(v); + } + }); + } + + + @Override + protected void onResume() { + super.onResume(); + listApps = (ListView)findViewById(R.id.applistview); - public void onClick(View v) { - finish(); - } - }); - - mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - loadApps(mPrefs); - } + Button btnSave = (Button)findViewById(R.id.btnsave); + btnSave.setOnClickListener(new OnClickListener() + { - SharedPreferences mPrefs = null; - ArrayList<TorifiedApp> mApps = null; - - private void loadApps (SharedPreferences prefs) - { - - mApps = getApps(getApplicationContext(), prefs); + public void onClick(View v) { + finish(); + } + }); + + mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + loadApps(mPrefs); + } + + 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) { - if (o1.isTorified() == o2.isTorified()) return o1.getName().compareTo(o2.getName()); - if (o1.isTorified()) return -1; - return 1; - } + public int compare(TorifiedApp o1, TorifiedApp o2) { + if (o1.isTorified() == o2.isTorified()) return o1.getName().compareTo(o2.getName()); + if (o1.isTorified()) return -1; + 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) { - ListEntry entry; - if (convertView == null) { - // Inflate a new view - convertView = inflater.inflate(R.layout.layout_apps_item, parent, false); - entry = new ListEntry(); - entry.icon = (ImageView) convertView.findViewById(R.id.itemicon); - entry.box = (CheckBox) convertView.findViewById(R.id.itemcheck); - entry.text = (TextView) convertView.findViewById(R.id.itemtext); - - entry.text.setOnClickListener(AppManager.this); - entry.text.setOnClickListener(AppManager.this); - - convertView.setTag(entry); - - entry.box.setOnCheckedChangeListener(AppManager.this); - } else { - // Convert an existing view - entry = (ListEntry) convertView.getTag(); - } - - - final TorifiedApp app = mApps.get(position); - - if (app.getIcon() != null) - entry.icon.setImageDrawable(app.getIcon()); - else - entry.icon.setVisibility(View.GONE); - - entry.text.setText(app.getName()); - - final CheckBox box = entry.box; - box.setTag(app); - box.setChecked(app.isTorified()); - - entry.text.setTag(box); - entry.icon.setTag(box); - - return convertView; - } + public View getView(int position, View convertView, ViewGroup parent) { + ListEntry entry; + if (convertView == null) { + // Inflate a new view + convertView = inflater.inflate(R.layout.layout_apps_item, parent, false); + entry = new ListEntry(); + entry.icon = (ImageView) convertView.findViewById(R.id.itemicon); + entry.box = (CheckBox) convertView.findViewById(R.id.itemcheck); + entry.text = (TextView) convertView.findViewById(R.id.itemtext); + + entry.text.setOnClickListener(AppManager.this); + entry.text.setOnClickListener(AppManager.this); + + convertView.setTag(entry); + + entry.box.setOnCheckedChangeListener(AppManager.this); + } else { + // Convert an existing view + entry = (ListEntry) convertView.getTag(); + } + + + final TorifiedApp app = mApps.get(position); + + if (app.getIcon() != null) + entry.icon.setImageDrawable(app.getIcon()); + else + entry.icon.setVisibility(View.GONE); + + entry.text.setText(app.getName()); + + final CheckBox box = entry.box; + box.setTag(app); + box.setChecked(app.isTorified()); + + entry.text.setTag(box); + entry.icon.setTag(box); + + 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(); - - } + } + + 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) + { + + String tordAppString = prefs.getString(PREFS_KEY_TORIFIED, ""); + String[] tordApps; + + StringTokenizer st = new StringTokenizer(tordAppString,"|"); + tordApps = new String[st.countTokens()]; + int tordIdx = 0; + while (st.hasMoreTokens()) + { + 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) + { + 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) + { + //System app + app.setUsesInternet(true); + } + + + 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); + + 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); + } + else + { + app.setTorified(false); + } + + appIdx++; + } + + Collections.sort(apps); + + return apps; + } + - - public static ArrayList<TorifiedApp> getApps (Context context, SharedPreferences prefs) - { + public void saveAppSettings (Context context) + { - String tordAppString = prefs.getString(PREFS_KEY_TORIFIED, ""); - String[] tordApps; - - StringTokenizer st = new StringTokenizer(tordAppString,"|"); - tordApps = new String[st.countTokens()]; - int tordIdx = 0; - while (st.hasMoreTokens()) - { - tordApps[tordIdx++] = st.nextToken(); - } - - Arrays.sort(tordApps); + StringBuilder tordApps = new StringBuilder(); - //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) - { - 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) - { - //System app - app.setUsesInternet(true); - } - - - 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); - - 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); - } - else - { - app.setTorified(false); - } - - appIdx++; - } - - Collections.sort(apps); - - return apps; - } - + for (TorifiedApp tApp:mApps) + { + if (tApp.isTorified()) + { + tordApps.append(tApp.getUsername()); + tordApps.append("|"); + } + } + + Editor edit = mPrefs.edit(); + edit.putString(PREFS_KEY_TORIFIED, tordApps.toString()); + edit.commit(); + + } + - public void saveAppSettings (Context context) - { + /** + * Called an application is check/unchecked + */ + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + final TorifiedApp app = (TorifiedApp) buttonView.getTag(); + if (app != null) { + app.setTorified(isChecked); + } + + saveAppSettings(this); - StringBuilder tordApps = new StringBuilder(); + } - for (TorifiedApp tApp:mApps) - { - if (tApp.isTorified()) - { - tordApps.append(tApp.getUsername()); - tordApps.append("|"); - } - } - - Editor edit = mPrefs.edit(); - edit.putString(PREFS_KEY_TORIFIED, tordApps.toString()); - edit.commit(); - - } - + public void autoCheckApplications(View button){ + ListView listView; + ListAdapter adapter; + TorifiedApp app; + float buttonId; + boolean[] isSelected; + int posI, selectedI, lvSz; - /** - * Called an application is check/unchecked - */ - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - final TorifiedApp app = (TorifiedApp) buttonView.getTag(); - if (app != null) { - app.setTorified(isChecked); - } - - saveAppSettings(this); + buttonId = button.getId(); + listView = (ListView) findViewById(R.id.applistview); + lvSz = listView.getCount(); + isSelected = new boolean[lvSz]; - } + selectedI = -1; + + for (posI = 0; posI < lvSz; ++posI){ + app = (TorifiedApp) listView.getItemAtPosition(posI); + if (buttonId == R.id.button_proxy_all){ + app.setTorified(true); + }else if (buttonId == R.id.button_proxy_none){ + app.setTorified(false); + }else { + app.setTorified(!app.isTorified()); + } + } + } - 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); - - } + 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); + + } - + }

1 0

[orbot/master] Merge branch 'app-selection'
by n8fr8＠torproject.org 14 Nov '14

14 Nov '14

commit c0dd584651948178c28cf8208cedbdbbb50b8aa0 Merge: 3f4b76a 59b3339 Author: Jordan <jordannh(a)sent.com> Date: Wed Aug 13 21:39:46 2014 -0700 Merge branch 'app-selection' res/layout/layout_apps.xml | 89 +++- res/values/strings.xml | 4 + .../torproject/android/settings/AppManager.java | 543 +++++++++++--------- 3 files changed, 376 insertions(+), 260 deletions(-)

1 0

[orbot/master] User can "Proxy all" or "Proxy none" apps in AppManager. TODO: fix invert button. It currently just selects none.
by n8fr8＠torproject.org 14 Nov '14

14 Nov '14

commit 67555d1ed45a711fd8d094be2b10310f9dbda4d1 Author: Jordan <jordannh(a)sent.com> Date: Thu Aug 14 13:15:17 2014 -0700 User can "Proxy all" or "Proxy none" apps in AppManager. TODO: fix invert button. It currently just selects none. --- .../torproject/android/settings/AppManager.java | 111 ++++++++++++-------- 1 file changed, 69 insertions(+), 42 deletions(-) diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index 88e2023..6d86b06 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -13,11 +13,13 @@ import java.util.StringTokenizer; + import org.torproject.android.R; import org.torproject.android.TorConstants; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceUtils; + //import android.R; import android.app.Activity; import android.content.Context; @@ -28,6 +30,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.MenuItem.OnMenuItemClickListener; import android.view.View; @@ -49,6 +52,7 @@ import android.widget.TextView; public class AppManager extends Activity implements OnCheckedChangeListener, OnClickListener, TorConstants { private ListView listApps; + private final static String TAG = "Orbot"; protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -61,27 +65,75 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC buttonSelectNone = (Button) findViewById(R.id.button_proxy_none); buttonInvert = (Button) findViewById(R.id.button_invert_selection); - buttonSelectAll.setOnClickListener(new Button.OnClickListener() { - @Override - public void onClick(View v) { - autoCheckApplications(v); + 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"); } - }); - buttonSelectNone.setOnClickListener(new Button.OnClickListener() { - @Override - public void onClick(View v) { - autoCheckApplications(v); + + Context context = getApplicationContext(); + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context); + ArrayList<TorifiedApp> apps = getApps(context, prefs); + parentView = (View) findViewById(R.layout.layout_apps); + 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(); } - }); - buttonInvert.setOnClickListener(new Button.OnClickListener() { - @Override - public void onClick(View v) { - autoCheckApplications(v); + + 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){ + if (!box.isChecked()) + box.performClick(); + }else if (buttonId == R.id.button_proxy_none){ + if (box.isChecked()) + box.performClick(); + }else { + box.performClick(); + } } - }); + saveAppSettings(context); + loadApps(prefs); + } } - @Override protected void onResume() { super.onResume(); @@ -324,32 +376,7 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC } - public void autoCheckApplications(View button){ - ListView listView; - ListAdapter adapter; - TorifiedApp app; - 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; - - for (posI = 0; posI < lvSz; ++posI){ - app = (TorifiedApp) listView.getItemAtPosition(posI); - if (buttonId == R.id.button_proxy_all){ - app.setTorified(true); - }else if (buttonId == R.id.button_proxy_none){ - app.setTorified(false); - }else { - app.setTorified(!app.isTorified()); - } - } - } + public void onClick(View v) {

1 0

[webwml/master] Updating the volunteer page project table
by atagar＠torproject.org 14 Nov '14

14 Nov '14

commit 05c1b605d82f66a2b36453c4507b7dff3da65ec9 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 14 09:22:49 2014 -0800 Updating the volunteer page project table Besides updating the activity levels we list this includes the following changes... * Combining Torbutton and TorLauncher into TorBrowser. TorButton no longer exists on its own, and our link to TorLauncher no longer worked. Pointing to TorButton's codebase since that's getting most activity, and the TorBrowser repo says it's for "old, pre 3.x". * Dropping Orchid again. It hasn't received any commits since November 2013 (a full year) - if the project indeed is still active somewhere then we need an updated link. * Dropped chiiph from Vidalia. He's been gone for a long time now, and we should be upfront that we don't have a maintainer. Adjusted maintainers elsewhere where appropriate to match who's actually working on things. * Dropping Torouter as it's been inactive since 2011 and isn't used in practice. There's lots of neat directions this space can go, but presently this codebase isn't it. * Listing the new maintainer of torsocks. --- getinvolved/en/volunteer.wml | 157 +++++++++--------------------------------- 1 file changed, 34 insertions(+), 123 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 4b87180..de02ed7 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -45,7 +45,7 @@ list of programs</a> that can be configured to use Tor.</li> <li>We have a huge list of <a href="<wiki>doc/SupportPrograms">potentially useful - programs that interface to Tor</a>. Which ones are useful in which + programs that interface with Tor</a>. Which ones are useful in which situations? Please help us test them out and document your results.</li> </ol> @@ -60,7 +60,7 @@ href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">tor-dev</a>, or <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev">tbb-dev</a>, and summarize noteworthy exchanges into articles for <a - href="https://lists.torproject.org/cgi-bin/mailman/listinfo">Tor + href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news">Tor Weekly News</a>.</li> <li>Create a presentation that can be used for various user group meetings around the world.</li> @@ -70,8 +70,7 @@ meetings around the world.</li> <a href="http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-Proxy">Howcast</a>, and <a href="http://www.youtube.com/thetorproject">YouTube</a>.</li> - <li>Create a poster, or a set of posters, around a theme, - such as "Tor for Freedom!"</li> + <li>Create a poster around a theme, such as "Tor for Freedom!"</li> <li>Create a t-shirt design that incorporates "<a href="https://check.torproject.org/">Congratulations! You are using Tor!</a>" in any language.</li> @@ -142,35 +141,11 @@ meetings around the world.</li> </tr> <tr> - <td>*<a href="#project-orchid">Orchid</a></td> - <td>Core</td> - <td>Java</td> - <td>Moderate</td> - <td>bleidl</td> - </tr> - - <tr> <td><a href="#project-torbrowser">Tor Browser</a></td> <td>Bundle</td> - <td>C, Scripting</td> - <td>Moderate</td> - <td>mikeperry, Erinn</td> - </tr> - - <tr> - <td><a href="#project-torbutton">Torbutton</a></td> - <td>Browser Add-on</td> - <td>Javascript</td> - <td>Moderate</td> - <td>mikeperry</td> - </tr> - - <tr> - <td><a href="#project-torlauncher">TorLauncher</a></td> - <td>Browser Add-on</td> - <td>Javascript, XUL</td> + <td>Javascript, XUL, Scripting</td> <td>Heavy</td> - <td>Pearl Crescent</td> + <td>mikeperry, Pearl Crescent</td> </tr> <tr> @@ -186,14 +161,14 @@ meetings around the world.</li> <td>User Interface</td> <td>C++, Qt</td> <td>None</td> - <td>chiiph</td> + <td></td> </tr> <tr> <td><a href="#project-arm">Arm</a></td> <td>User Interface</td> <td>Python, Curses</td> - <td>Light</td> + <td>Moderate</td> <td>atagar</td> </tr> @@ -217,39 +192,31 @@ meetings around the world.</li> <td><a href="#project-torramdisk">tor-ramdisk</a></td> <td>OS image</td> <td>Sys Admin</td> - <td>None</td> + <td>Light</td> <td>blueness</td> </tr> <tr> - <td>*<a href="#project-torouter">Torouter</a></td> - <td>OS image</td> - <td>Sys Admin</td> - <td>None</td> - <td>ioerror</td> - </tr> - - <tr> <td><a href="#project-torsocks">Torsocks</a></td> <td>Usability</td> <td>C</td> <td>Light</td> - <td>ioerror, nickm</td> + <td>David Goulet</td> </tr> <tr> <td><a href="#project-torbirdy">TorBirdy</a></td> <td>Browser Add-on</td> <td>JavaScript</td> - <td>Heavy</td> - <td>Sukhbir (sukhe)</td> + <td>Light</td> + <td>sukhe</td> </tr> <tr> <td><a href="#project-obfsproxy">Obfsproxy</a></td> <td>Client Add-on</td> <td>Python</td> - <td>Moderate</td> + <td>Light</td> <td>asn</td> </tr> @@ -257,8 +224,8 @@ meetings around the world.</li> <td><a href="#project-flash-proxy">Flash Proxy</a></td> <td>Client Add-on</td> <td>Python, JavaScript, Go</td> - <td>Heavy</td> - <td>dcf, infinity0, aallai, jct</td> + <td>Moderate</td> + <td>dcf, infinity0, Arlo Breault</td> </tr> <tr> @@ -273,7 +240,7 @@ meetings around the world.</li> <td><a href="#project-stem">Stem</a></td> <td>Library</td> <td>Python</td> - <td>Heavy</td> + <td>Moderate</td> <td>atagar</td> </tr> @@ -281,7 +248,7 @@ meetings around the world.</li> <td><a href="#project-txtorcon">Txtorcon</a></td> <td>Library</td> <td>Python, Twisted</td> - <td>Moderate</td> + <td>Light</td> <td>meejah</td> </tr> @@ -289,7 +256,7 @@ meetings around the world.</li> <td><a href="#project-tlsdate">Tlsdate</a></td> <td>Utility</td> <td>C</td> - <td>Moderate</td> + <td>Heavy</td> <td>ioerror</td> </tr> @@ -297,7 +264,7 @@ meetings around the world.</li> <td><a href="#project-metrics">Metrics</a></td> <td>Client Service</td> <td>Java</td> - <td>Moderate</td> + <td>Light</td> <td>karsten</td> </tr> @@ -306,30 +273,30 @@ meetings around the world.</li> <td>Client Service</td> <td>JavaScript</td> <td>Light</td> - <td>hellais, karsten</td> + <td></td> </tr> <tr> <td><a href="#project-globe">Globe</a></td> <td>Client Service</td> <td>JavaScript</td> - <td>Heavy</td> - <td>Christian</td> + <td>None</td> + <td></td> </tr> <tr> <td><a href="#project-compass">Compass</a></td> <td>Client Service</td> <td>Python</td> - <td>Light</td> - <td>gsathya, karsten, cwacek</td> + <td>None</td> + <td></td> </tr> <tr> <td><a href="#project-onionoo">Onionoo</a></td> <td>Backend Service</td> <td>Java</td> - <td>Moderate</td> + <td>Heavy</td> <td>karsten</td> </tr> @@ -361,7 +328,7 @@ meetings around the world.</li> <td><a href="#project-torcheck">TorCheck</a></td> <td>Client Service</td> <td>Go</td> - <td>Moderate</td> + <td>None</td> <td>Arlo</td> </tr> @@ -369,16 +336,16 @@ meetings around the world.</li> <td><a href="#project-bridgedb">BridgeDB</a></td> <td>Backend Service</td> <td>Python</td> - <td>Light</td> - <td>kaner, nickm</td> + <td>None</td> + <td>isis</td> </tr> <tr> <td><a href="#project-ooni-probe">Ooni Probe</a></td> <td>Scanner</td> <td>Python</td> - <td>Moderate</td> - <td>hellais, isis, ioerror</td> + <td>Heavy</td> + <td>hellais, aagbsn</td> </tr> <tr> @@ -394,7 +361,7 @@ meetings around the world.</li> <td>Backend Service</td> <td>Python</td> <td>None</td> - <td>aagbsn, mikeperry</td> + <td>aagbsn</td> </tr> <tr> @@ -409,7 +376,7 @@ meetings around the world.</li> <td><a href="#project-tor2web">Tor2web</a></td> <td>Client Service</td> <td>Python</td> - <td>Moderate</td> + <td>None</td> <td>evilaliv3, hellais</td> </tr> @@ -417,7 +384,7 @@ meetings around the world.</li> <td><a href="#project-anonbib">Anonbib</a></td> <td>Website</td> <td>Python</td> - <td>Light</td> + <td>Moderate</td> <td>arma, nickm</td> </tr> @@ -451,20 +418,10 @@ meetings around the world.</li> <i><a href="#torSandboxing">Help improve Tor sandboxing</a></i> </p> - <a id="project-orchid"></a> - <h3><a href="https://github.com/subgraph/Orchid">Orchid</a> (<a - href="https://github.com/subgraph/Orchid">code</a>, <a - href="https://github.com/subgraph/Orchid/issues">bug - tracker</a>)</h3> - - <p> - Java implementation of Tor and successor to <a href="http://onioncoffee.sourceforge.net/">OnionCoffee</a>. - </p> - <a id="project-torbrowser"></a> <h3><a href="<page projects/torbrowser>">Tor Browser</a> (<a - href="https://gitweb.torproject.org/torbrowser.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug + href="https://gitweb.torproject.org/torbutton.git">code</a>, <a + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>, <a href="https://www.torproject.org/projects/torbrowser/design/">design doc</a>)</h3> <p> @@ -480,33 +437,6 @@ meetings around the world.</li> <i><a href="#panopticlick">Panopticlick</a></i><br /> </p> - <a id="project-torbutton"></a> - <h3><a href="<page docs/torbutton/index>">Torbutton</a> (<a - href="https://gitweb.torproject.org/torbutton.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug - tracker</a>)</h3> - - <p> - Firefox addon that addresses many of the client-side threats to browsing - the Internet anonymously. Mike has since continued to adapt it to new - threats and updated versions of Firefox</a>. - </p> - - <a id="project-torlauncher"></a> - <h3>TorLauncher (<a - href="https://gitweb.torproject.org/torlauncher.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug - tracker</a>)</h3> - - <p> - Firefox addon that interfaces between the Tor Browser's browser components - and Tor. It - addresses many usability issues of Tor Browser by making certain common - Tor configurations, like bridge use, easy to set. Kathy and Mark of Pearl - Crescent continue to add improvements as Tor Browser's feature set - increases. - </p> - <a id="project-httpseverywhere"></a> <h3><a href="https://www.eff.org/https-everywhere">HTTPS Everywhere</a> (<a href="https://gitweb.torproject.org/https-everywhere.git">code</a>, <a @@ -588,18 +518,6 @@ meetings around the world.</li> purpose is to securely host a Tor server purely in RAM. </p> - <a id="project-torouter"></a> - <h3><a - href="<wiki>doc/Torouter">Torouter</a> (<a - href="https://gitweb.torproject.org/torouter.git">code</a>, <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug - tracker</a>)</h3> - - <p> - Project to provide an easy-to-use, embedded Tor instance for routers. This - had high activity in late 2010, but has since been rather quiet. - </p> - <a id="project-torsocks"></a> <h3>Torsocks (<a href="https://gitweb.torproject.org/torsocks.git">code</a>, <a @@ -1025,13 +943,6 @@ meetings around the world.</li> improvements if we run across any gaps. </p> <p> - This project has the potential for numerous users, one of which is an - interface for <a - href="#project-torouter">Torouter</a>. - We should check if Torouter has any special use cases or constraints we - should take into consideration. - </p> - <p> Applicants should be familiar with Python, JavaScript, and learn about <a href="https://stem.torproject.org/">Stem</a>. <b>As part of your application for this project please make both mockups of the interface and

1 0

[webwml/master] Improving the readme instructions
by atagar＠torproject.org 14 Nov '14

14 Nov '14

commit 43377598d49ab106be6d8d13fbbceae612b6d4ac Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 14 08:34:04 2014 -0800 Improving the readme instructions Roger's instructions were nice, but they were still a wall of text. When I run into a readme I want it to help me get things set up quickly. As such, adding brief setup instrucions and a troubleshooting section. Roger's instructions were also missing the ascidoc dependency. --- README | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/README b/README index 2d66da2..80afdc5 100644 --- a/README +++ b/README @@ -1,3 +1,44 @@ +To quickly get set up simply do the following... + + 1. Get the website's build dependencies. + + % sudo apt-get install wml asciidoc + + 2. Configure where to find your tor git repository. It needs this to make the + manual page. + + % git clone https://git.torproject.org/project/web/webwml.git + % cd webwml + % cp Makefile.local.sample Makefile.local + [ change the TORGIT in Makefile.local to point to your tor git repo ] + + 3. Make the website. + + % make + +You should now be able to point your browser at the locally generated site... + + file:///home/atagar/Desktop/tor/webwml/getinvolved/volunteer.html.en + +-------------------------------------------------------------------------------- +Troubleshooting +-------------------------------------------------------------------------------- + +* The build fails with "Invalid object name". + + If you get an error like... + + ---- Contents of STDERR channel: --------- + fatal: Invalid object name 'tor-0.2.6.1-alpha'. + asciidoc: FAILED: manpage document title is mandatory + No manpage because of asciidoc error or file not available from git at /tmp/wml.zwcq0q/wml.30867.tmp1.wml line 415. + + This means your tor repository is out of date. Update your tor git repository. + +-------------------------------------------------------------------------------- +More detailed instructions from Roger +-------------------------------------------------------------------------------- + Here are the instructions I sent David Fifield when he asked about editing the website. I hope they are useful for you too! --Roger

1 0

[tor/master] document that hiddenserviceport can have an ipv6 addr.for 12670
by nickm＠torproject.org 14 Nov '14

14 Nov '14

commit ab08d8c4f7a4a6120756e964a086219a1dc3aaa2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 14 11:19:34 2014 -0500 document that hiddenserviceport can have an ipv6 addr.for 12670 --- doc/tor.1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index eb406e7..a33185b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2042,6 +2042,7 @@ The following options are used to configure a hidden service. recent HiddenServiceDir. By default, this option maps the virtual port to the same port on 127.0.0.1 over TCP. You may override the target port, address, or both by specifying a target of addr, port, or addr:port. + (You can specify an IPv6 target as [addr]:port.) You may also have multiple lines with the same VIRTPORT: when a user connects to that VIRTPORT, one of the TARGETs from those lines will be chosen at random.

1 0

[webwml/master] We want people to have at least 250KB to be a relay
by sebastian＠torproject.org 14 Nov '14

14 Nov '14

commit 681691dabb8819f4c62b4a6c78f5962a581c4e36 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Nov 14 09:18:43 2014 +0100 We want people to have at least 250KB to be a relay --- docs/en/tor-doc-windows.wml | 2 +- getinvolved/en/tshirt.wml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/tor-doc-windows.wml b/docs/en/tor-doc-windows.wml index c28f194..a339feb 100644 --- a/docs/en/tor-doc-windows.wml +++ b/docs/en/tor-doc-windows.wml @@ -45,7 +45,7 @@ <p>The Tor network relies on volunteers to donate bandwidth. The more people who run relays, the faster the Tor network will be. If you have - at least 100 KiloBytes/s each way, please help out Tor by configuring your + at least 250 KiloBytes/s each way, please help out Tor by configuring your Tor to be a relay too. We have many features that make Tor relays easy and convenient, including rate limiting for bandwidth, exit policies so you can limit your exposure to abuse complaints, and support for dynamic diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml index 43b0bd7..4a156d6 100644 --- a/getinvolved/en/tshirt.wml +++ b/getinvolved/en/tshirt.wml @@ -21,7 +21,7 @@ donate/donate>">donation</a> to the Tor Project.</li> <li>Operate a fast <a href="<page docs/tor-doc-relay>">Tor relay</a> that's been running for the past two months: you are eligible if you - allow exits to port 80 and you average 100 KBytes/s traffic, or if you're + allow exits to port 80 and you average 250 KBytes/s traffic, or if you're not an exit but you average 500 KBytes/s traffic.</li> <li>Help out in <a href="<page getinvolved/volunteer>">other ways</a>. <a href="<page

1 0

[orbot/master] Fixed annoying typo
by n8fr8＠torproject.org 13 Nov '14

13 Nov '14

commit cdae262a2b14f0e3ddc762d0e1f1be16332ca714 Author: SecUpwN <secupwn(a)z1p.biz> Date: Wed Sep 24 07:24:30 2014 +0000 Fixed annoying typo --- res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index cc31b5b..ea51b0f 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -148,7 +148,7 @@ <string name="status">Status</string> <string name="setting_up_full_transparent_proxying_">Voll transparente Vermittlung wird eingestellt …</string> <string name="setting_up_app_based_transparent_proxying_">Anwendungsbasierte transparente Vermittlung wird eingestellt …</string> - <string name="transparent_proxying_enabled">Transparentes Vermittlung AKTIVIERT</string> + <string name="transparent_proxying_enabled">Transparente Vermittlung AKTIVIERT</string> <string name="transproxy_enabled_for_tethering_">TransProxy für Anbindung aktiviert!</string> <string name="warning_error_starting_transparent_proxying_">WARNUNG: Fehler beim Starten der transparenten Vermittlung!</string> <string name="transproxy_rules_cleared">TransProxy Regeln gelöscht</string>

1 0

[orbot/master] Merge pull request #7 from SecUpwN/master
by n8fr8＠torproject.org 13 Nov '14

13 Nov '14

commit 3c4642cc823ac5ec30993ad2eb8af2a0efcfef39 Merge: 939df61 cdae262 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Sep 25 10:47:38 2014 -0400 Merge pull request #7 from SecUpwN/master Fixed annoying typo res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0