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

[orbot/master] update resource to make smaller
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit 2676cd3fc6884836d9b9efc5139d98481b80d7ae Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Oct 21 14:39:04 2016 -0400 update resource to make smaller --- app/src/main/res/drawable/oldtoroff.png | Bin 63700 -> 0 bytes app/src/main/res/drawable/oldtoron.png | Bin 121036 -> 0 bytes app/src/main/res/drawable/oldtorstarting.png | Bin 111753 -> 0 bytes app/src/main/res/drawable/toroff.png | Bin 39556 -> 19187 bytes app/src/main/res/drawable/toron.png | Bin 47022 -> 19057 bytes app/src/main/res/drawable/torstarting.png | Bin 41700 -> 18052 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/src/main/res/drawable/oldtoroff.png b/app/src/main/res/drawable/oldtoroff.png deleted file mode 100644 index 4b23e0b..0000000 Binary files a/app/src/main/res/drawable/oldtoroff.png and /dev/null differ diff --git a/app/src/main/res/drawable/oldtoron.png b/app/src/main/res/drawable/oldtoron.png deleted file mode 100644 index a99bec1..0000000 Binary files a/app/src/main/res/drawable/oldtoron.png and /dev/null differ diff --git a/app/src/main/res/drawable/oldtorstarting.png b/app/src/main/res/drawable/oldtorstarting.png deleted file mode 100644 index a56844a..0000000 Binary files a/app/src/main/res/drawable/oldtorstarting.png and /dev/null differ diff --git a/app/src/main/res/drawable/toroff.png b/app/src/main/res/drawable/toroff.png index a72790b..759400f 100644 Binary files a/app/src/main/res/drawable/toroff.png and b/app/src/main/res/drawable/toroff.png differ diff --git a/app/src/main/res/drawable/toron.png b/app/src/main/res/drawable/toron.png index e3592b1..12f830a 100644 Binary files a/app/src/main/res/drawable/toron.png and b/app/src/main/res/drawable/toron.png differ diff --git a/app/src/main/res/drawable/torstarting.png b/app/src/main/res/drawable/torstarting.png index 6e84a6f..3a08305 100644 Binary files a/app/src/main/res/drawable/torstarting.png and b/app/src/main/res/drawable/torstarting.png differ

1 0

[orbot/master] improve bridge dialog display
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit c76d935cc3499086051219b1d7b91cbbb26d9bbe Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 24 15:31:41 2016 -0400 improve bridge dialog display --- app/src/main/res/layout/layout_diag.xml | 2 +- app/src/main/res/values/arrays.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/layout/layout_diag.xml b/app/src/main/res/layout/layout_diag.xml index c19a5b1..df38971 100644 --- a/app/src/main/res/layout/layout_diag.xml +++ b/app/src/main/res/layout/layout_diag.xml @@ -9,6 +9,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_margin="9dp" + android:layout_margin="3dp" /> </ScrollView> \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 30d20c1..7defef0 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -8,7 +8,6 @@ <item>ScrambleSuit</item> <item>Tunnel through Azure</item> <item>Tunnel through Amazon</item> - <item>Tunnel through Google</item> <item>Get New Bridges</item> <item></item> </string-array>

1 0

[orbot/master] make the VPN/apps mode have a better UI flow
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit 28f1dbf7ddeee85c438fad6e72f9c4bf235fec08 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 24 14:30:46 2016 -0400 make the VPN/apps mode have a better UI flow --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 4 +- .../org/torproject/android/OrbotMainActivity.java | 28 +++++++++--- .../java/org/torproject/android/ui/AppManager.java | 51 +++++++++++----------- app/src/main/res/drawable/rounded_button.xml | 13 ++++++ app/src/main/res/layout/layout_apps.xml | 15 ++----- app/src/main/res/layout/layout_apps_item.xml | 1 + app/src/main/res/layout/layout_main.xml | 12 +++-- app/src/main/res/menu/orbot_main.xml | 17 ++++---- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/strings.xml | 2 +- .../android/service/util/TorServiceUtils.java | 11 ++--- 12 files changed, 93 insertions(+), 63 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1b029de..8b7fbb6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,4 +30,5 @@ dependencies { compile project(':orbotservice') compile 'com.android.support:support-v4:23.4.0' compile 'com.android.support:appcompat-v7:23.4.0' + } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9b65a34..d0df9e3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -86,7 +86,9 @@ <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> - <activity android:name=".ui.AppManager" android:label="@string/app_name"/> + <activity android:name=".ui.AppManager" android:label="@string/app_name" + android:theme="@style/Theme.AppCompat" + /> <service android:name=".service.TorService" diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 5aa4cec..202cff5 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -22,6 +22,7 @@ import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.settings.SettingsPreferences; +import org.torproject.android.ui.AppManager; import org.torproject.android.ui.ImageProgressView; import org.torproject.android.ui.PromoAppsActivity; import org.torproject.android.ui.Rotate3dAnimation; @@ -111,6 +112,9 @@ public class OrbotMainActivity extends AppCompatActivity private final static int REQUEST_VPN = 8888; private final static int REQUEST_SETTINGS = 0x9874; + private final static int REQUEST_VPN_APPS_SELECT = 8889; + + private final static boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; // message types for mStatusUpdateHandler private final static int STATUS_UPDATE = 1; @@ -169,7 +173,8 @@ public class OrbotMainActivity extends AppCompatActivity private void stopTor() { - imgStatus.setImageResource(R.drawable.torstarting); + requestTorStatus(); + Intent torService = new Intent(OrbotMainActivity.this, TorService.class); stopService(torService); @@ -320,8 +325,12 @@ public class OrbotMainActivity extends AppCompatActivity Prefs.putUseVpn(isChecked); - if (isChecked) - startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); + if (isChecked) { + if (mIsLollipop) //let the user choose the apps + startActivityForResult(new Intent(OrbotMainActivity.this, AppManager.class),REQUEST_VPN_APPS_SELECT); + else + startActivity(new Intent(OrbotMainActivity.this, VPNEnableActivity.class)); + } else stopVpnService(); } @@ -434,11 +443,12 @@ public class OrbotMainActivity extends AppCompatActivity Intent intent = new Intent(OrbotMainActivity.this, SettingsPreferences.class); startActivityForResult(intent, REQUEST_SETTINGS); } + /** else if (item.getItemId() == R.id.menu_promo_apps) { startActivity(new Intent(OrbotMainActivity.this, PromoAppsActivity.class)); - } + }*/ else if (item.getItemId() == R.id.menu_exit) { //exit app @@ -859,6 +869,10 @@ public class OrbotMainActivity extends AppCompatActivity } } + else if (request == REQUEST_VPN_APPS_SELECT) + { + startActivity(new Intent(OrbotMainActivity.this, VPNEnableActivity.class)); + } IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data); if (scanResult != null) { @@ -1190,8 +1204,10 @@ public class OrbotMainActivity extends AppCompatActivity } else lblStatus.setText(getString(R.string.status_starting_up)); - - mBtnBrowser.setEnabled(false); + + mBtnStart.setText("..."); + + mBtnBrowser.setEnabled(false); } else if (torStatus == TorServiceConstants.STATUS_STOPPING) { 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 82a20b3..84af48d 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManager.java +++ b/app/src/main/java/org/torproject/android/ui/AppManager.java @@ -23,6 +23,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Bundle; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -38,7 +40,7 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.TextView; -public class AppManager extends Activity implements OnCheckedChangeListener, OnClickListener, OrbotConstants { +public class AppManager extends AppCompatActivity implements OnCheckedChangeListener, OnClickListener, OrbotConstants { private ListView listApps; private final static String TAG = "Orbot"; @@ -47,6 +49,8 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC super.onCreate(savedInstanceState); this.setContentView(R.layout.layout_apps); + setTitle(R.string.apps_mode); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); Button buttonSelectAll, buttonSelectNone, buttonInvert; @@ -108,15 +112,16 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC 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(); + app.setTorified(true); }else if (this.status == 1){ - if (box.isChecked()) - box.performClick(); + app.setTorified(false); }else { - box.performClick(); + app.setTorified(!app.isTorified()); } + + box.setChecked(app.isTorified()); } saveAppSettings(context); loadApps(prefs); @@ -128,15 +133,6 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC super.onResume(); listApps = (ListView)findViewById(R.id.applistview); - Button btnSave = (Button)findViewById(R.id.btnsave); - btnSave.setOnClickListener(new OnClickListener() - { - - public void onClick(View v) { - finish(); - } - }); - mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); loadApps(mPrefs); } @@ -161,11 +157,18 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC 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 + + ListEntry entry = null; + + if (convertView == null) convertView = inflater.inflate(R.layout.layout_apps_item, parent, false); + else + entry = (ListEntry) convertView.getTag();; + + if (entry == null) { + // Inflate a new view entry = new ListEntry(); entry.icon = (ImageView) convertView.findViewById(R.id.itemicon); entry.box = (CheckBox) convertView.findViewById(R.id.itemcheck); @@ -177,19 +180,15 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC 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) + + if (app.getIcon() != null && entry.icon != null) entry.icon.setImageDrawable(app.getIcon()); else entry.icon.setVisibility(View.GONE); - + entry.text.setText(app.getName()); final CheckBox box = entry.box; diff --git a/app/src/main/res/drawable/rounded_button.xml b/app/src/main/res/drawable/rounded_button.xml new file mode 100644 index 0000000..528cc41 --- /dev/null +++ b/app/src/main/res/drawable/rounded_button.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + + <corners android:radius="15dp"/> // if you want clear round shape then make radius size is half of your button`s height. + <solid android:color="#78af52"/> // Button Colour + <padding + android:bottom="3dp" + android:left="3dp" + android:right="3dp" + android:top="3dp"/> + +</shape> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_apps.xml b/app/src/main/res/layout/layout_apps.xml index d3633a0..00d46d6 100644 --- a/app/src/main/res/layout/layout_apps.xml +++ b/app/src/main/res/layout/layout_apps.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="fill_parent" + android:layout_width="match_parent" + android:layout_height="match_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:duplicateParentState="true"> @@ -25,20 +25,11 @@ </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:layout_alignParentBottom="true" android:orientation="horizontal" > <Button diff --git a/app/src/main/res/layout/layout_apps_item.xml b/app/src/main/res/layout/layout_apps_item.xml index 9d16efd..c16d1cd 100644 --- a/app/src/main/res/layout/layout_apps_item.xml +++ b/app/src/main/res/layout/layout_apps_item.xml @@ -5,6 +5,7 @@ android:layout_height="fill_parent" android:stretchColumns="1"> <TableRow> + <ImageView android:id="@+id/itemicon" android:layout_width="50dip" android:layout_height="50dip" android:padding="3dip"></ImageView> <TextView android:layout_height="wrap_content" android:id="@+id/itemtext" android:text="uid:packages" android:textSize="18sp" android:padding="3dip"></TextView> diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index 8692bc1..2759cf5 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -4,7 +4,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - + + android:background="@color/dark_purple" > <android.support.v7.widget.Toolbar @@ -67,9 +68,10 @@ android:layout_gravity="center_horizontal|center_vertical"/> > <Button android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="40dp" android:text="@string/menu_start" android:id="@+id/btnStart" + android:background="@drawable/rounded_button" /> @@ -77,11 +79,13 @@ android:layout_gravity="center_horizontal|center_vertical"/> <Button android:id="@+id/btnBrowser" android:layout_width="wrap_content" - android:layout_height="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> diff --git a/app/src/main/res/menu/orbot_main.xml b/app/src/main/res/menu/orbot_main.xml index 9f97a81..54d2493 100644 --- a/app/src/main/res/menu/orbot_main.xml +++ b/app/src/main/res/menu/orbot_main.xml @@ -24,46 +24,47 @@ <item android:id="@+id/menu_settings" android:title="@string/menu_settings" android:icon="@drawable/ic_action_settings" - yourapp:showAsAction="always" + yourapp:showAsAction="never" /> <item android:title="@string/menu_qr" - android:showAsAction="never" + yourapp:showAsAction="never" > <menu> <item android:id="@+id/menu_scan" android:title="@string/menu_scan" - android:showAsAction="never" + yourapp:showAsAction="never" /> <item android:id="@+id/menu_share_bridge" android:title="@string/menu_share_bridge" - android:showAsAction="never" + yourapp:showAsAction="never" /> </menu> </item> - +  <item android:id="@+id/menu_about" android:title="@string/menu_about" android:icon="@drawable/ic_menu_about" - android:showAsAction="never" + yourapp:showAsAction="never" /> <item android:id="@+id/menu_exit" android:title="@string/menu_exit" android:icon="@drawable/ic_menu_exit" - android:showAsAction="never" + yourapp:showAsAction="never" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 19e06e7..af92426 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,4 +5,5 @@ <color name="panel_background_main">#efefef</color> <color name="bright_green">#ccff2a</color> <color name="dark_green">#669901</color> + <color name="dark_purple">#3f2b4f</color> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bef8abe..7f4f15a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -335,5 +335,5 @@ <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string> - <string name="vpn_default_world">World</string> + <string name="vpn_default_world">World (Location)</string> </resources> diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java index 9fa8bb8..764bc9e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java @@ -146,11 +146,12 @@ public class TorServiceUtils implements TorServiceConstants { shell = Shell.startShell(); }*/ - Runtime.getRuntime().exec("busybox killall " + signal + " " + fileProcBin.getName()); - Runtime.getRuntime().exec("toolbox kill " + signal + " " + pidString); - Runtime.getRuntime().exec("busybox kill " + signal + " " + pidString); - Runtime.getRuntime().exec("kill " + signal + " " + pidString); - try { + try { Runtime.getRuntime().exec("busybox killall " + signal + " " + fileProcBin.getName());}catch(IOException ioe){} + try { Runtime.getRuntime().exec("toolbox kill " + signal + " " + pidString);}catch(IOException ioe){} + try { Runtime.getRuntime().exec("busybox kill " + signal + " " + pidString);}catch(IOException ioe){} + try { Runtime.getRuntime().exec("kill " + signal + " " + pidString);}catch(IOException ioe){} + + try { Thread.sleep(1000); } catch (InterruptedException e) { // ignored

1 0

[orbot/master] fix browser install request
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit ac037a9dc5b4e83cd352c55184dae2582dc7d8f5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 24 15:00:47 2016 -0400 fix browser install request --- .../org/torproject/android/OrbotMainActivity.java | 24 ++++++----- .../torproject/android/ui/PromoAppsActivity.java | 17 ++++---- app/src/main/res/layout/layout_main.xml | 48 ++++++++-------------- 3 files changed, 40 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 202cff5..d95e0f2 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -737,8 +737,12 @@ public class OrbotMainActivity extends AppCompatActivity private void openBrowser(final String browserLaunchUrl,boolean forceExternal) { boolean isBrowserInstalled = appInstalledOrNot(TorServiceConstants.BROWSER_APP_USERNAME); - - if (mBtnVPN.isChecked()||forceExternal) + + if (isBrowserInstalled) + { + startIntent(TorServiceConstants.BROWSER_APP_USERNAME,Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); + } + else if (mBtnVPN.isChecked()||forceExternal) { //use the system browser since VPN is on Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); @@ -751,10 +755,6 @@ public class OrbotMainActivity extends AppCompatActivity intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); } - else if (isBrowserInstalled) - { - startIntent(TorServiceConstants.BROWSER_APP_USERNAME,Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); - } else { AlertDialog aDialog = new AlertDialog.Builder(OrbotMainActivity.this) @@ -768,10 +768,13 @@ public class OrbotMainActivity extends AppCompatActivity public void onClick(DialogInterface dialog, int which) { //prompt to install Orweb - Intent intent = new Intent(OrbotMainActivity.this,PromoAppsActivity.class); - startActivity(intent); - - } + //Intent intent = new Intent(OrbotMainActivity.this,PromoAppsActivity.class); + //startActivity(intent); + + startActivity(PromoAppsActivity.getInstallIntent(TorServiceConstants.BROWSER_APP_USERNAME,OrbotMainActivity.this)); + + + } }) .setNegativeButton(R.string.standard_browser, new Dialog.OnClickListener () @@ -1291,7 +1294,6 @@ public class OrbotMainActivity extends AppCompatActivity if (torStatus == null && newTorStatus != null) //first time status { torStatus = newTorStatus; - findViewById(R.id.pbConnecting).setVisibility(View.GONE); findViewById(R.id.frameMain).setVisibility(View.VISIBLE); updateStatus(log); diff --git a/app/src/main/java/org/torproject/android/ui/PromoAppsActivity.java b/app/src/main/java/org/torproject/android/ui/PromoAppsActivity.java index 01c2483..2fdf2df 100644 --- a/app/src/main/java/org/torproject/android/ui/PromoAppsActivity.java +++ b/app/src/main/java/org/torproject/android/ui/PromoAppsActivity.java @@ -1,6 +1,7 @@ package org.torproject.android.ui; import android.app.Activity; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -69,7 +70,7 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { @Override public void onClick(View view) { finish(); - startActivity(getInstallIntent("info.guardianproject.otr.app.im")); + startActivity(getInstallIntent("info.guardianproject.otr.app.im",PromoAppsActivity.this)); } }); @@ -81,7 +82,7 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { @Override public void onClick(View view) { finish(); - startActivity(getInstallIntent(TorServiceConstants.BROWSER_APP_USERNAME)); + startActivity(getInstallIntent(TorServiceConstants.BROWSER_APP_USERNAME,PromoAppsActivity.this)); } }); @@ -94,7 +95,7 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { public void onClick(View view) { finish(); - startActivity(getInstallIntent("com.duckduckgo.mobile.android")); + startActivity(getInstallIntent("com.duckduckgo.mobile.android",PromoAppsActivity.this)); } }); @@ -120,7 +121,7 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { @Override public void onClick(View view) { finish(); - startActivity(getInstallIntent("info.guardianproject.mrapp")); + startActivity(getInstallIntent("info.guardianproject.mrapp",PromoAppsActivity.this)); } }); @@ -132,7 +133,7 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { @Override public void onClick(View view) { finish(); - startActivity(getInstallIntent("org.martus.android")); + startActivity(getInstallIntent("org.martus.android",PromoAppsActivity.this)); } }); @@ -179,7 +180,7 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { } - boolean isAppInstalled(PackageManager pm, String packageName) { + public static boolean isAppInstalled(PackageManager pm, String packageName) { try { pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES); return true; @@ -188,11 +189,11 @@ public class PromoAppsActivity extends Activity implements OrbotConstants { } } - Intent getInstallIntent(String packageName) { + public static Intent getInstallIntent(String packageName, Context context) { final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri.parse(MARKET_URI + packageName)); - PackageManager pm = getPackageManager(); + PackageManager pm = context.getPackageManager(); List<ResolveInfo> resInfos = pm.queryIntentActivities(intent, 0); String foundPackageName = null; diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index 2759cf5..3dfd15a 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -2,7 +2,9 @@ <LinearLayout android:gravity="center_vertical|center_horizontal" xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/dark_purple" @@ -23,32 +25,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/content_frame" - > - - <LinearLayout android:gravity="center_vertical|center_horizontal" - android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content" - - > - - <ProgressBar - android:id="@+id/pbConnecting" - style="?android:attr/progressBarStyleLarge" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="60dp" - android:visibility="gone" - -android:layout_gravity="center_horizontal|center_vertical"/> - + > + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="400dp" android:id="@+id/frameMain" android:visibility="visible" android:orientation="vertical" - android:layout_gravity="center_horizontal|center_vertical" + android:gravity="center_horizontal|center_vertical" > <org.torproject.android.ui.ImageProgressView android:id="@+id/imgStatus" @@ -58,7 +44,7 @@ android:layout_gravity="center_horizontal|center_vertical"/> android:padding="0dp" android:layout_margin="0dp" android:src="@drawable/toroff" /> - + <LinearLayout android:gravity="center_horizontal" @@ -88,9 +74,6 @@ android:layout_gravity="center_horizontal|center_vertical"/> /> </LinearLayout> - </LinearLayout> - - </LinearLayout> <LinearLayout @@ -116,31 +99,36 @@ android:layout_gravity="center_horizontal|center_vertical"/> <android.support.v7.widget.SwitchCompat android:id="@+id/btnVPN" - android:layout_width="80dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/menu_vpn" android:layout_margin="3dp" - android:ellipsize="end" android:singleLine="true" - /> + app:switchPadding="9dp" + + /> <android.support.v7.widget.SwitchCompat android:id="@+id/btnBridges" - android:layout_width="100dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/bridges" android:layout_marginTop="3dp" android:layout_marginLeft="5dp" android:layout_marginBottom="3dp" - android:ellipsize="end" android:singleLine="true" + app:switchPadding="9dp" /> <Spinner android:id="@+id/spinnerCountry" android:layout_width="140dp" android:layout_height="wrap_content" android:layout_weight="1" + + android:layout_marginTop="3dp" + android:layout_marginLeft="5dp" + android:layout_marginBottom="3dp" /> </LinearLayout>

1 0

[orbot/master] update to 15.2.0-beta-2
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit 12b1198b4b5a4420b16b9ab166828bba787c17aa Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 24 16:51:52 2016 -0400 update to 15.2.0-beta-2 --- app/src/main/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d0df9e3..7cd708c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.2.0-beta-1" - android:versionCode="15200010" + android:versionName="15.2.0-beta-2" + android:versionCode="15200020" android:installLocation="auto" > <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>

1 0

[orbot/master] move the controls to the left sidebar; improve VPN mode more
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit 345aea9ad2e93e9724bdb503b44664aa58215fc8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 24 16:50:59 2016 -0400 move the controls to the left sidebar; improve VPN mode more --- .../org/torproject/android/OrbotMainActivity.java | 54 +++---- .../java/org/torproject/android/ui/AppManager.java | 17 +- app/src/main/res/layout/layout_diag.xml | 2 +- app/src/main/res/layout/layout_main.xml | 171 ++------------------- app/src/main/res/layout/layout_orbot_control.xml | 124 +++++++++++++++ app/src/main/res/values/arrays.xml | 2 - 6 files changed, 184 insertions(+), 186 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index d95e0f2..93e79b2 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -322,17 +322,9 @@ public class OrbotMainActivity extends AppCompatActivity @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + enableVPN(isChecked); - Prefs.putUseVpn(isChecked); - if (isChecked) { - if (mIsLollipop) //let the user choose the apps - startActivityForResult(new Intent(OrbotMainActivity.this, AppManager.class),REQUEST_VPN_APPS_SELECT); - else - startActivity(new Intent(OrbotMainActivity.this, VPNEnableActivity.class)); - } - else - stopVpnService(); } }); @@ -550,6 +542,19 @@ public class OrbotMainActivity extends AppCompatActivity } + + private void enableVPN (boolean enable) + { + Prefs.putUseVpn(enable); + + if (enable) { + if (mIsLollipop) //let the user choose the apps + startActivityForResult(new Intent(OrbotMainActivity.this, AppManager.class), REQUEST_VPN_APPS_SELECT); + else + startActivity(new Intent(OrbotMainActivity.this, VPNEnableActivity.class)); + } else + stopVpnService(); + } private void enableHiddenServicePort (int hsPort) throws RemoteException, InterruptedException { @@ -758,7 +763,6 @@ public class OrbotMainActivity extends AppCompatActivity else { AlertDialog aDialog = new AlertDialog.Builder(OrbotMainActivity.this) - .setIcon(R.drawable.onion32) .setTitle(R.string.install_apps_) .setMessage(R.string.it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_) .setPositiveButton(R.string.install_orweb, new Dialog.OnClickListener () @@ -777,6 +781,13 @@ public class OrbotMainActivity extends AppCompatActivity } }) + .setNeutralButton(R.string.apps_mode, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + // enableVPN(true); + mBtnVPN.setChecked(true); + } + }) .setNegativeButton(R.string.standard_browser, new Dialog.OnClickListener () { @@ -864,8 +875,9 @@ public class OrbotMainActivity extends AppCompatActivity } else if (request == REQUEST_VPN) { - if (response == RESULT_OK) - sendIntentToService(TorServiceConstants.CMD_VPN); + if (response == RESULT_OK) { + sendIntentToService(TorServiceConstants.CMD_VPN); + } else { Prefs.putUseVpn(false); @@ -949,27 +961,17 @@ public class OrbotMainActivity extends AppCompatActivity enableBridges(true); break; - case 1: //obfs3 - setupBridgeType("obfs3"); - enableBridges(true); - - break; - case 2: //scramblesuit - setupBridgeType("scramblesuit"); - enableBridges(true); - - break; - case 3: //azure + case 1: //azure Prefs.setBridgesList("2"); enableBridges(true); break; - case 4: //amazon + case 2: //amazon Prefs.setBridgesList("1"); enableBridges(true); break; - case 5: + case 3: showGetBridgePrompt("obfs4"); break; @@ -1224,7 +1226,7 @@ public class OrbotMainActivity extends AppCompatActivity } else if (torStatus == TorServiceConstants.STATUS_OFF) { imgStatus.setImageResource(R.drawable.toroff); - lblStatus.setText(getString(R.string.press_to_start)); + // lblStatus.setText(getString(R.string.press_to_start)); mBtnBrowser.setEnabled(false); mBtnStart.setText(R.string.menu_start); 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 84af48d..85fe4b3 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManager.java +++ b/app/src/main/java/org/torproject/android/ui/AppManager.java @@ -27,6 +27,7 @@ import android.support.v7.app.ActionBarActivity; import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; +import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; @@ -127,7 +128,21 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList loadApps(prefs); } } - + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + setResult(RESULT_OK); + finish(); + return true; + + + } + + return false; + } + @Override protected void onResume() { super.onResume(); diff --git a/app/src/main/res/layout/layout_diag.xml b/app/src/main/res/layout/layout_diag.xml index df38971..5b4ce21 100644 --- a/app/src/main/res/layout/layout_diag.xml +++ b/app/src/main/res/layout/layout_diag.xml @@ -9,6 +9,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_margin="3dp" + android:layout_margin="6dp" /> </ScrollView> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index 3dfd15a..ab566ec 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -33,9 +33,10 @@ android:layout_height="400dp" android:id="@+id/frameMain" android:visibility="visible" - android:orientation="vertical" - android:gravity="center_horizontal|center_vertical" - > + android:orientation="vertical" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> <org.torproject.android.ui.ImageProgressView android:id="@+id/imgStatus" android:layout_width="match_parent" @@ -76,166 +77,14 @@ </LinearLayout> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="bottom" - android:layout_gravity="bottom" - android:padding="3dp" - android:background="#454545" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true"> - - <LinearLayout android:gravity="center_horizontal" - android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" - - > - - <android.support.v7.widget.SwitchCompat - android:id="@+id/btnVPN" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/menu_vpn" - android:layout_margin="3dp" - android:singleLine="true" - app:switchPadding="9dp" - - /> - - - <android.support.v7.widget.SwitchCompat - android:id="@+id/btnBridges" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/bridges" - android:layout_marginTop="3dp" - android:layout_marginLeft="5dp" - android:layout_marginBottom="3dp" - android:singleLine="true" - app:switchPadding="9dp" - /> - <Spinner - android:id="@+id/spinnerCountry" - android:layout_width="140dp" - android:layout_height="wrap_content" - android:layout_weight="1" - - android:layout_marginTop="3dp" - android:layout_marginLeft="5dp" - android:layout_marginBottom="3dp" - /> - - </LinearLayout> - - - - <TextView - android:id="@+id/lblStatus" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textSize="14sp" - android:gravity="center_horizontal" - android:fontFamily="sans-serif-light" - android:text="" - android:lines="2" - android:maxLines="2" - android:layout_gravity="center_horizontal" - android:layout_margin="0dp" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" - android:visibility="gone" - /> - -  - - <RelativeLayout - android:id="@+id/rowTrafficDown" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingLeft="3sp" - android:paddingRight="3sp" - - > - <TextView - android:id="@+id/trafficLabelDown" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textSize="15sp" - android:text="@string/main_layout_download" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" /> - <TextView - android:id="@+id/trafficLabelUp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:text="@string/main_layout_upload" - android:textSize="15sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" /> - - </RelativeLayout> - <RelativeLayout - android:id="@+id/rowTrafficUp" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="3sp" - android:paddingRight="3sp" - android:paddingBottom="3sp" - - > - <TextView - android:id="@+id/trafficDown" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textSize="15sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - /> - - <TextView - android:id="@+id/trafficUp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:textSize="15sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - /> - </RelativeLayout> - </LinearLayout> - - </RelativeLayout> <LinearLayout - android:layout_width="320dp" + android:layout_width="250dp" android:layout_height="match_parent" android:orientation="vertical" android:id="@+id/left_drawer" @@ -243,6 +92,9 @@ android:background="#333333" > + <include layout="@layout/layout_orbot_control"/> + + </LinearLayout> <LinearLayout @@ -252,7 +104,14 @@ android:id="@+id/right_drawer" android:layout_gravity="end" android:background="#333333" + android:padding="6dp" > + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/menu_log" + android:textAppearance="?android:attr/textAppearanceMedium" + /> <TextView android:id="@+id/orbotLog" android:textSize="12sp" diff --git a/app/src/main/res/layout/layout_orbot_control.xml b/app/src/main/res/layout/layout_orbot_control.xml new file mode 100644 index 0000000..870eda4 --- /dev/null +++ b/app/src/main/res/layout/layout_orbot_control.xml @@ -0,0 +1,124 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="3dp"> + + + <android.support.v7.widget.SwitchCompat + android:id="@+id/btnVPN" + android:layout_width="200dp" + android:layout_height="wrap_content" + android:text="@string/apps_mode" + android:layout_margin="12dp" + android:singleLine="true" + app:switchPadding="9dp" + /> + + + <android.support.v7.widget.SwitchCompat + android:id="@+id/btnBridges" + android:layout_width="200dp" + android:layout_height="wrap_content" + android:text="@string/bridges" + android:layout_margin="12dp" + android:singleLine="true" + app:switchPadding="9dp" + /> + + + <Spinner + android:id="@+id/spinnerCountry" + android:layout_width="220dp" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:layout_marginLeft="9dp" + /> + + + + + <RelativeLayout + android:id="@+id/rowTrafficDown" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingLeft="3sp" + android:paddingRight="3sp" + android:layout_margin="12dp" + > + <TextView + android:id="@+id/trafficLabelDown" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:textSize="15sp" + android:text="@string/main_layout_download" + android:gravity="center_vertical" + android:fontFamily="sans-serif-light" /> + + + <TextView + android:id="@+id/trafficDown" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:textSize="15sp" + android:gravity="center_vertical" + android:fontFamily="sans-serif-light" + /> + </RelativeLayout> + <RelativeLayout + android:id="@+id/rowTrafficUp" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:paddingLeft="3sp" + android:paddingRight="3sp" + android:paddingBottom="3sp" + android:layout_margin="12dp" + + > + + <TextView + android:id="@+id/trafficLabelUp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:text="@string/main_layout_upload" + android:textSize="15sp" + android:gravity="center_vertical" + android:fontFamily="sans-serif-light" /> + + <TextView + android:id="@+id/trafficUp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:textSize="15sp" + android:gravity="center_vertical" + android:fontFamily="sans-serif-light" + /> + </RelativeLayout> + + <TextView + android:id="@+id/lblStatus" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="14sp" + android:fontFamily="sans-serif-light" + android:text="" + android:lines="2" + android:maxLines="2" + android:layout_margin="12dp" + /> + + </LinearLayout> + +</LinearLayout> \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 7defef0..795a419 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -4,8 +4,6 @@ <string-array name="bridge_options"> <item>Obfs4 (Best)</item> - <item>Obfs3</item> - <item>ScrambleSuit</item> <item>Tunnel through Azure</item> <item>Tunnel through Amazon</item> <item>Get New Bridges</item>

1 0

[orbot/master] update CHANGELOG 15.2.0-beta-2
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit b4906c09fdf3ec59a2a7dace14084c413a9549f0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 24 16:53:06 2016 -0400 update CHANGELOG 15.2.0-beta-2 --- CHANGELOG | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2f5b1fb..2f19c1f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,20 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.2.0 BETA 2 / 24 October 2016/ 12b1198b4b5a4420b16b9ab166828bba787c17aa **/ + +345aea9 move the controls to the left sidebar; improve VPN mode more +c76d935 improve bridge dialog display +ac037a9 fix browser install request +28f1dbf make the VPN/apps mode have a better UI flow +c1ffdbb put browser button back in +518f70d comment out notification actions for now +0bb8e84 update Tor version to 0.2.8.9 +2125db1 make start and stop of Tor service all hanlded through executor +d8648a5 remove meek-google as an option +2676cd3 update resource to make smaller +3ee6b2a don't fail on lint for release builds +e3d7ca2 update tor 0.2.8.9 + /** 15.2.0 BETA 1 / 13 October 2016/ abaa3f83fc64b9b567a5d437d26db0f660655f35 **/ cd8b549 add the compiled tun2socks lib for devs who just want to work on UI

1 0

[torspec/master] Merge remote-tracking branch 'pastly/ticket20273'
by nickm＠torproject.org 24 Oct '16

24 Oct '16

commit 657efebc950e737c3ecf281650d134a99990835c Merge: 6d968a1 b31f0e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 24 12:48:02 2016 -0400 Merge remote-tracking branch 'pastly/ticket20273' dir-spec.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

1 0

[torspec/master] Change 1 to weight_scale in dir-spec section 3.8.3
by nickm＠torproject.org 24 Oct '16

24 Oct '16

commit b31f0e19b7ccd923d47309683060f08fa2b074a2 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Oct 3 20:52:15 2016 -0400 Change 1 to weight_scale in dir-spec section 3.8.3 --- dir-spec.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index d5e8376..b7b8566 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2635,9 +2635,9 @@ The following methods have incorrect implementations; authorities SHOULD Wgg*G + Wgd*D == M + Wmd*D + Wme*E + Wmg*G (guard bw = middle bw) Wgg*G + Wgd*D == Wee*E + Wed*D (guard bw = exit bw) - Wed*D + Wmd*D + Wgd*D == D (aka: Wed+Wmd+Wdg = 1) - Wmg*G + Wgg*G == G (aka: Wgg = 1-Wmg) - Wme*E + Wee*E == E (aka: Wee = 1-Wme) + Wed*D + Wmd*D + Wgd*D == D (aka: Wed+Wmd+Wdg = weight_scale) + Wmg*G + Wgg*G == G (aka: Wgg = weight_scale-Wmg) + Wme*E + Wee*E == E (aka: Wee = weight_scale-Wme) We are short 2 constraints with the above set. The remaining constraints come from examining different cases of network load. The following @@ -2684,8 +2684,8 @@ The following methods have incorrect implementations; authorities SHOULD In this case, if M <= T/3, we have enough bandwidth to try to achieve a balancing condition. - Add constraints Wgg = 1, Wmd == Wgd to maximize bandwidth in the guard - position while still allowing exits to be used as middle nodes: + Add constraints Wgg = weight_scale, Wmd == Wgd to maximize bandwidth in + the guard position while still allowing exits to be used as middle nodes: Wee = (weight_scale*(E - G + M))/E Wed = (weight_scale*(D - 2*E + 4*G - 2*M))/(3*D) @@ -2696,8 +2696,8 @@ The following methods have incorrect implementations; authorities SHOULD Wgd = (weight_scale - Wed)/2 If this system ends up with any values out of range (ie negative, or - above weight_scale), use the constraints Wgg == 1 and Wee == 1, since - both those positions are scarce: + above weight_scale), use the constraints Wgg == weight_scale and Wee == + weight_scale, since both those positions are scarce: Wgg = weight_scale Wee = weight_scale @@ -2736,7 +2736,7 @@ The following methods have incorrect implementations; authorities SHOULD Subcase b: (S+D) >= T/3 if G=S: - Add constraints Wgg = 1, Wmd == Wed to maximize bandwidth + Add constraints Wgg = weight_scale, Wmd == Wed to maximize bandwidth in the guard position, while still allowing exits to be used as middle nodes: Wgg = weight_scale @@ -2747,7 +2747,7 @@ The following methods have incorrect implementations; authorities SHOULD Wmd = (weight_scale - Wgd)/2 Wed = (weight_scale - Wgd)/2 if E=S: - Add constraints Wee == 1, Wmd == Wgd to maximize bandwidth + Add constraints Wee == weight_scale, Wmd == Wgd to maximize bandwidth in the exit position: Wee = weight_scale; Wed = (weight_scale*(D - 2*E + G + M))/(3*D);

1 0

[tor/master] Merge remote-tracking branch 'pastly/ticket20273'
by nickm＠torproject.org 24 Oct '16

24 Oct '16

commit 01482e30ad8a453f3721ef17a4a9633806b90684 Merge: 410f1a4 5503eec Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 24 12:47:29 2016 -0400 Merge remote-tracking branch 'pastly/ticket20273' changes/20273 | 4 ++++ src/or/dirvote.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-)

1 0