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

[collector/master] Make sure the sync-markers are used allover; added some constants,
by karsten＠torproject.org 25 Oct '16

25 Oct '16

commit b8386ce0e39aeadff82bdb9bc155ad6e69c23ec7 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Oct 25 15:06:10 2016 +0200 Make sure the sync-markers are used allover; added some constants, and a sync-marker test. --- .../torproject/collector/cron/CollecTorMain.java | 6 +-- .../collector/exitlists/ExitListDownloader.java | 2 +- .../org/torproject/collector/sync/SyncManager.java | 4 +- .../collector/cron/CollecTorMainTest.java | 59 ++++++++++++++++++++++ 4 files changed, 66 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/collector/cron/CollecTorMain.java index 4a3b6c6..c9c931f 100644 --- a/src/main/java/org/torproject/collector/cron/CollecTorMain.java +++ b/src/main/java/org/torproject/collector/cron/CollecTorMain.java @@ -31,7 +31,7 @@ public abstract class CollecTorMain extends SyncManager CollecTorMain.class); private static final long LIMIT_MB = 200; - + public static final String SOURCES = "Sources"; private final AtomicBoolean newConfigAvailable = new AtomicBoolean(false); protected Configuration config = new Configuration(); @@ -83,13 +83,13 @@ public abstract class CollecTorMain extends SyncManager } private boolean isSync() throws ConfigurationException { - String key = this.syncMarker() + "Sources"; + String key = this.syncMarker() + SOURCES; return Key.has(key) && config.getSourceTypeSet(Key.valueOf(key)) .contains(SourceType.Sync); } private boolean isSyncOnly() throws ConfigurationException { - String key = this.syncMarker() + "Sources"; + String key = this.syncMarker() + SOURCES; return this.isSync() && config.getSourceTypeSet(Key.valueOf(key)).size() == 1; } diff --git a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java index 81fab3d..3c2f403 100644 --- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java @@ -58,7 +58,7 @@ public class ExitListDownloader extends CollecTorMain { @Override protected String syncMarker() { - return "Exitlists"; + return "Exitlist"; } @Override diff --git a/src/main/java/org/torproject/collector/sync/SyncManager.java b/src/main/java/org/torproject/collector/sync/SyncManager.java index d0a4407..1390d50 100644 --- a/src/main/java/org/torproject/collector/sync/SyncManager.java +++ b/src/main/java/org/torproject/collector/sync/SyncManager.java @@ -28,6 +28,8 @@ import java.util.Set; public class SyncManager { private static final Logger log = LoggerFactory.getLogger(SyncManager.class); + public static final String SYNCORIGINS = "SyncOrigins"; + private Date collectionDate; public SyncManager() { /* empty */ } @@ -36,7 +38,7 @@ public class SyncManager { public void merge(Configuration conf, String marker, Map<String, Class<? extends Descriptor>> mapPathDesc) throws ConfigurationException { - URL[] sources = conf.getUrlArray(Key.valueOf(marker + "SyncOrigins")); + URL[] sources = conf.getUrlArray(Key.valueOf(marker + SYNCORIGINS)); collectionDate = new Date(); collectFromOtherInstances(sources, mapPathDesc.keySet(), marker, conf); mergeWithLocalStorage(sources, mapPathDesc, marker, conf); diff --git a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java index befaad3..cfb3cf6 100644 --- a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java +++ b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java @@ -3,16 +3,28 @@ package org.torproject.collector.cron; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import org.torproject.collector.Main; +import org.torproject.collector.conf.Configuration; +import org.torproject.collector.conf.Key; +import org.torproject.collector.sync.SyncManager; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; import java.io.File; import java.io.IOException; +import java.lang.reflect.Field; import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; public class CollecTorMainTest { @@ -33,5 +45,52 @@ public class CollecTorMainTest { "existant", "but", "no", "exception")); } + /* Verifies that every sync-marker is configured in the + * default collector.properties file and the other way around. */ + @Test() + public void testSyncMarker() throws Exception { + Properties props = new Properties(); + props.load(getClass().getClassLoader().getResourceAsStream( + Main.CONF_FILE)); + String[] syncSettings = new String[] {CollecTorMain.SOURCES, + SyncManager.SYNCORIGINS}; + Field ctmField = Main.class.getDeclaredField("collecTorMains"); + ctmField.setAccessible(true); + Map<Key, Class<? extends CollecTorMain>> ctms + = (Map<Key, Class<? extends CollecTorMain>>) ctmField.get(Main.class); + List<String> markers = new ArrayList<>(); + for (Map.Entry<Key, Class<? extends CollecTorMain>> entry + : ctms.entrySet()) { + String marker = entry.getValue().getConstructor(Configuration.class) + .newInstance(new Configuration()).syncMarker(); + markers.add(marker); + String key = marker + CollecTorMain.SOURCES; + String sources = props.getProperty(key); + switch (marker) { + case "Relay": + case "Bridge": + case "Exitlist": + assertNotNull("Property '" + key + + "' not specified in " + Main.CONF_FILE + ".", + props.getProperty(key)); + break; + default: + assertNull("Property '" + key + + "' should not be listed in " + Main.CONF_FILE + ".", + props.getProperty(key)); + break; + } + } + for (String propName : props.stringPropertyNames()) { + for (String part : syncSettings) { + if (propName.endsWith(part)) { + String key = propName.replace(part, ""); + assertTrue("CollecTorMain '" + key + "' not specified in Main.class.", + markers.contains(key)); + } + } + } + } + }

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 25 Oct '16

25 Oct '16

commit 3e54f8f920c6f9d4d38fd2e1a8515671a46ac833 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 25 08:16:34 2016 +0000 Update translations for torbutton-torbuttondtd --- hu/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu/torbutton.dtd b/hu/torbutton.dtd index d6e1d05..88fd413 100644 --- a/hu/torbutton.dtd +++ b/hu/torbutton.dtd @@ -25,10 +25,10 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne védje az új sütiket"> <!ENTITY torbutton.prefs.restrict_thirdparty "A harmadik féltől származó sütik és nyomkövetési adatok korlátozása"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hagyja ezt a gombot bejelölve, hogy megakadályozza, hogy különböző böngésző lehetőségek eltérítésre kerülhessenek a webes nyomon követhetősége érdekében. A módosított szolgáltatások többek között, blob URL, broadcast csatornák, böngésző cache, sütik, favikonok, HTTP Auth fejlécek, link előcsatlakozások, localStorage, mediaSource URL-ek, OCSP kérések, SharedWorkers-ek, és TLS session ticketek."> <!ENTITY torbutton.prefs.resist_fingerprinting "Változtassa meg a részleteket, amik megkülönböztetik a többi Tor Browser felhasználótól"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your battery status, computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hagyja ezt a gombot bejelölve, hogy elrejtsen dolgokat weboldalak elől, amik egyedivé tehetik, mint elem állapot, számítógép teljesítmény, billentyűzet kiosztás, hely, a telepített pluginek helye, a telepített pluginek listája, hálózati állapota, képernyő irányítottsága, oldal specifikus nagyítás szintek, támogatott fájltípusok, rendszerszínek, és WebGL képességek,"> <!ENTITY torbutton.prefs.sec_caption "Biztonsági szint"> <!ENTITY torbutton.prefs.sec_caption_tooltip "A Biztonsági Csúszóka lehetővé tesz, hogy kikapcsoljon olyan böngésző funkcionalitásokat, amik sebezhetővé teszik a törési kísérletekben."> <!ENTITY torbutton.prefs.sec_low "Alacsony (alapértelmezett)">

1 0

[tor-browser/tor-browser-45.4.0esr-6.5-1] Bug 1311044 - show error when connection to domain socket is failed; r=bagder
by gk＠torproject.org 25 Oct '16

25 Oct '16

commit b91682cd038d63eb2dbec1303c2ab9a65a43775b Author: Liang-Heng Chen <xeonchen(a)mozilla.com> Date: Wed Oct 19 18:28:02 2016 +0800 Bug 1311044 - show error when connection to domain socket is failed; r=bagder MozReview-Commit-ID: GtqKiMVwQyX --HG-- extra : rebase_source : 04e3b258f06e7d3e196c241c96aa3cc92ec334da --- netwerk/socket/nsSOCKSIOLayer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp b/netwerk/socket/nsSOCKSIOLayer.cpp index be69725..d20fe7f 100644 --- a/netwerk/socket/nsSOCKSIOLayer.cpp +++ b/netwerk/socket/nsSOCKSIOLayer.cpp @@ -515,10 +515,16 @@ nsSOCKSSocketInfo::ConnectToProxy(PRFileDesc *fd) status = fd->lower->methods->connect(fd->lower, &prProxy, mTimeout); if (status != PR_SUCCESS) { PRErrorCode c = PR_GetError(); + // If EINPROGRESS, return now and check back later after polling if (c == PR_WOULD_BLOCK_ERROR || c == PR_IN_PROGRESS_ERROR) { mState = SOCKS_CONNECTING_TO_PROXY; return status; + } else if (IsHostDomainSocket()) { + LOGERROR(("socks: connect to domain socket failed (%d)", c)); + PR_SetError(PR_CONNECT_REFUSED_ERROR, 0); + mState = SOCKS_FAILED; + return status; } } } while (status != PR_SUCCESS);

1 0

[orbot/master] update Tor version to 0.2.8.9
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit 0bb8e846adf6c09bbd3a71ef990f32acaa9212f7 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 24 10:40:38 2016 -0400 update Tor version to 0.2.8.9 --- .../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 f431b0c..bcaaf86 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -134,7 +134,7 @@ public interface TorServiceConstants { public static final String CMD_SET_EXIT = "setexit"; - public static final String BINARY_TOR_VERSION = "0.2.8.1-1"; + public static final String BINARY_TOR_VERSION = "0.2.8.9"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy

1 0

[orbot/master] make start and stop of Tor service all hanlded through executor
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit 2125db1504a075a62cf9b301071f3e723dc59f24 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Oct 21 14:53:58 2016 -0400 make start and stop of Tor service all hanlded through executor --- app/src/main/java/org/torproject/android/OnBootReceiver.java | 3 +-- .../src/main/java/org/torproject/android/service/TorService.java | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/app/src/main/java/org/torproject/android/OnBootReceiver.java index 722f4f1..f915a20 100644 --- a/app/src/main/java/org/torproject/android/OnBootReceiver.java +++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java @@ -41,8 +41,7 @@ public class OnBootReceiver extends BroadcastReceiver { Intent torService = new Intent(context, TorService.class); torService.setAction(action); context.startService(torService); - - + } 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 5cd3e75..e4faeb5 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -109,8 +109,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; - private ExecutorService mExecutor = Executors.newFixedThreadPool(1); - + private ExecutorService mExecutor = Executors.newFixedThreadPool(3); TorEventHandler mEventHandler; @@ -296,7 +295,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon */ public int onStartCommand(Intent intent, int flags, int startId) { if (intent != null) - new Thread (new IncomingIntentRouter(intent)).start(); + exec (new IncomingIntentRouter(intent)); else Log.d(OrbotConstants.TAG, "Got null onStartCommand() intent"); @@ -363,13 +362,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private void stopTor () { - mExecutor.execute(new Runnable () + exec(new Runnable () { public void run () { stopTorAsync(); } }); + } private void stopTorAsync () {

1 0

[orbot/master] update changelog with tag hash
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit 126c82adc212e72bf180e0c430cc245ae0a99902 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 17 11:04:54 2016 -0400 update changelog with tag hash --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 81da933..2f5b1fb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ -/** 15.2.0 BETA 1 / 13 October 2016 **/ +/** 15.2.0 BETA 1 / 13 October 2016/ abaa3f83fc64b9b567a5d437d26db0f660655f35 **/ cd8b549 add the compiled tun2socks lib for devs who just want to work on UI 3c181bc add the proguard rules

1 0

[orbot/master] update tor 0.2.8.9
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit e3d7ca28a0d18be837ef9ccb4e373860c95e2ea2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Oct 20 10:30:22 2016 -0400 update tor 0.2.8.9 --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index 2630886..44c5fc6 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit 263088633a63982a8d6ddffd3ed3e3d85cffd6f1 +Subproject commit 44c5fc6878d91d6069ed8c58ba6ad3b1f9b2963b

1 0

[orbot/master] don't fail on lint for release builds
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit 3ee6b2a6b5ddb79ef306fb661aa03f7d7804754b Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Oct 20 10:50:19 2016 -0400 don't fail on lint for release builds --- app/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 05932ab..1b029de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,6 +11,13 @@ android { } + lintOptions { + checkReleaseBuilds false + // Or, if you prefer, you can continue to check for errors in release builds, + // but continue the build even when errors are found: + abortOnError false + } + buildTypes { release { minifyEnabled false

1 0

[orbot/master] put browser button back in
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit c1ffdbb4e79320891b28810498207b7faa39e8c0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 24 10:50:14 2016 -0400 put browser button back in --- .../org/torproject/android/OrbotMainActivity.java | 43 ++++-- app/src/main/res/layout/layout_main.xml | 169 +++++++++++++-------- 2 files changed, 136 insertions(+), 76 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 556179a..5aa4cec 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -90,8 +90,10 @@ public class OrbotMainActivity extends AppCompatActivity private TextView uploadText = null; private TextView mTxtOrbotLog = null; - // private Button mBtnBrowser = null; - private SwitchCompat mBtnVPN = null; + private Button mBtnBrowser = null; + private Button mBtnStart = null; + + private SwitchCompat mBtnVPN = null; private SwitchCompat mBtnBridges = null; private Spinner spnCountries = null; @@ -258,7 +260,24 @@ public class OrbotMainActivity extends AppCompatActivity // Gesture detection mGestureDetector = new GestureDetector(this, new MyGestureDetector()); - /** + + mBtnStart =(Button)findViewById(R.id.btnStart); + mBtnStart.setOnClickListener(new View.OnClickListener() + { + @Override + public void onClick(View v) { + + if (torStatus == TorServiceConstants.STATUS_OFF) { + lblStatus.setText(getString(R.string.status_starting_up)); + startTor(); + } else { + lblStatus.setText(getString(R.string.status_shutting_down)); + stopTor(); + } + + } + }); + mBtnBrowser = (Button)findViewById(R.id.btnBrowser); mBtnBrowser.setOnClickListener(new View.OnClickListener () { @@ -272,7 +291,6 @@ public class OrbotMainActivity extends AppCompatActivity }); mBtnBrowser.setEnabled(false); - */ mBtnVPN = (SwitchCompat)findViewById(R.id.btnVPN); @@ -1125,12 +1143,14 @@ public class OrbotMainActivity extends AppCompatActivity imgStatus.setImageResource(R.drawable.toron); - //mBtnBrowser.setEnabled(true); + mBtnBrowser.setEnabled(true); + mBtnStart.setText(R.string.menu_stop); if (torServiceMsg != null) { - if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) - lblStatus.setText(torServiceMsg); + if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) { + lblStatus.setText(torServiceMsg); + } } else lblStatus.setText(getString(R.string.status_activated)); @@ -1171,7 +1191,7 @@ public class OrbotMainActivity extends AppCompatActivity else lblStatus.setText(getString(R.string.status_starting_up)); - // mBtnBrowser.setEnabled(false); + mBtnBrowser.setEnabled(false); } else if (torStatus == TorServiceConstants.STATUS_STOPPING) { @@ -1180,13 +1200,16 @@ public class OrbotMainActivity extends AppCompatActivity imgStatus.setImageResource(R.drawable.torstarting); lblStatus.setText(torServiceMsg); - // mBtnBrowser.setEnabled(false); + mBtnBrowser.setEnabled(false); } else if (torStatus == TorServiceConstants.STATUS_OFF) { imgStatus.setImageResource(R.drawable.toroff); lblStatus.setText(getString(R.string.press_to_start)); -// mBtnBrowser.setEnabled(false); + mBtnBrowser.setEnabled(false); + + mBtnStart.setText(R.string.menu_start); + } if (torServiceMsg != null && torServiceMsg.length() > 0) diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index b834135..8692bc1 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -18,10 +18,9 @@ android:layout_height="match_parent" > -<LinearLayout +<RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:id="@+id/content_frame" > @@ -59,84 +58,107 @@ android:layout_gravity="center_horizontal|center_vertical"/> android:layout_margin="0dp" android:src="@drawable/toroff" /> - <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" - /> - + + <LinearLayout android:gravity="center_horizontal" - android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:orientation="horizontal" android:layout_width="match_parent" + android:layout_height="wrap_content" + + > + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/menu_start" + android:id="@+id/btnStart" + + /> - > -  - - - <android.support.v7.widget.SwitchCompat - android:id="@+id/btnVPN" - android:layout_width="100dp" - android:layout_height="wrap_content" - android:text="@string/menu_vpn" - android:layout_margin="3dp" - android:ellipsize="end" - android:singleLine="true" - /> - - - <android.support.v7.widget.SwitchCompat - android:id="@+id/btnBridges" - android:layout_width="100dp" - android:layout_height="wrap_content" - android:text="@string/bridges" - android:layout_marginTop="3dp" - android:layout_marginLeft="25dp" - android:layout_marginBottom="3dp" - android:ellipsize="end" - android:singleLine="true" - /> - + /> + </LinearLayout> - </LinearLayout> </LinearLayout> - <Spinner - android:id="@+id/spinnerCountry" - android:layout_width="200dp" - android:layout_height="wrap_content" - android:layout_weight="1" - /> + </LinearLayout> <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:orientation="vertical" android:gravity="bottom" - android:padding="6dp" - > + 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="80dp" + android:layout_height="wrap_content" + android:text="@string/menu_vpn" + android:layout_margin="3dp" + android:ellipsize="end" + android:singleLine="true" + /> + + + <android.support.v7.widget.SwitchCompat + android:id="@+id/btnBridges" + android:layout_width="100dp" + 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" + /> + <Spinner + android:id="@+id/spinnerCountry" + android:layout_width="140dp" + android:layout_height="wrap_content" + android:layout_weight="1" + /> + + </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" + />  @@ -214,20 +237,34 @@ android:layout_gravity="center_horizontal|center_vertical"/> /> </RelativeLayout> </LinearLayout> - </LinearLayout> + + + </RelativeLayout> + + + <LinearLayout + android:layout_width="320dp" + android:layout_height="match_parent" + android:orientation="vertical" + android:id="@+id/left_drawer" + android:layout_gravity="start" + android:background="#333333" + > + + </LinearLayout> <LinearLayout android:layout_width="320dp" android:layout_height="match_parent" android:orientation="vertical" - android:id="@+id/left_drawer" - android:layout_gravity="start" + android:id="@+id/right_drawer" + android:layout_gravity="end" android:background="#333333" > <TextView android:id="@+id/orbotLog" android:textSize="12sp" - android:gravity="left" + android:gravity="start" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignParentLeft="true" @@ -238,7 +275,7 @@ android:layout_gravity="center_horizontal|center_vertical"/> </LinearLayout> </android.support.v4.widget.DrawerLayout> - + </LinearLayout>

1 0

[orbot/master] comment out notification actions for now
by n8fr8＠torproject.org 24 Oct '16

24 Oct '16

commit 518f70d8721624e9cbbf8e58c4b53004f9a17b17 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Oct 24 10:49:47 2016 -0400 comment out notification actions for now --- .../java/org/torproject/android/service/TorService.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 e4faeb5..d1ae1fd 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -26,6 +26,7 @@ import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; +import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; import android.support.v4.app.NotificationCompat; @@ -208,6 +209,22 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon .setSmallIcon(R.drawable.ic_stat_tor); mNotifyBuilder.setContentIntent(pendIntent); + + /** + //Restart intent + Intent yesReceive = new Intent(); + yesReceive.setAction("Restart"); + PendingIntent pendingIntentYes = PendingIntent.getBroadcast(this, 12345, yesReceive, PendingIntent.FLAG_UPDATE_CURRENT); + mNotifyBuilder.addAction(R.drawable.ic_stat_tor_off, "Restart", pendingIntentYes); + + + //Maybe intent + Intent maybeReceive = new Intent(); + maybeReceive.setAction("Identity"); + PendingIntent pendingIntentMaybe = PendingIntent.getBroadcast(this, 12345, maybeReceive, PendingIntent.FLAG_UPDATE_CURRENT); + mNotifyBuilder.addAction(R.drawable.ic_stat_tor_xfer, "New Identity", pendingIntentMaybe); + **/ + } }

1 0