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

[orbot/master] update default built in bridges
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit 11c6abf59d2ba044aad704db6d55c166e28bec08 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 22 12:46:14 2017 -0400 update default built in bridges --- orbotservice/src/main/assets/bridges.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/orbotservice/src/main/assets/bridges.txt b/orbotservice/src/main/assets/bridges.txt index 77994bb..bb194a3 100644 --- a/orbotservice/src/main/assets/bridges.txt +++ b/orbotservice/src/main/assets/bridges.txt @@ -1,8 +1,3 @@ -obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239 -obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED -obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0 obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0 obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0 @@ -23,5 +18,5 @@ obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXX obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1 obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0 -meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com -meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com +meek_lite 0.0.2.0:1 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com +meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com \ No newline at end of file

1 0

[orbot/master] update to latest gradle
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit 128cfe8394f365ee2bc8a64dd4191fd77f89a0f4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Mar 19 23:11:12 2017 -0400 update to latest gradle --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 856d3d7..97e8b8e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.3.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 122a0dc..1b8daf6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Sun Mar 19 08:31:31 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

1 0

[orbot/master] remove bridge logic from activity (now in service)
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit c0d082ed78d462230bab972aa91176f7f4cf4211 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 22 12:47:38 2017 -0400 remove bridge logic from activity (now in service) --- .../org/torproject/android/OrbotMainActivity.java | 93 ++-------------------- 1 file changed, 7 insertions(+), 86 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 4945002..8e34467 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -132,15 +132,6 @@ public class OrbotMainActivity extends AppCompatActivity public final static String INTENT_ACTION_REQUEST_HIDDEN_SERVICE = "org.torproject.android.REQUEST_HS_PORT"; public final static String INTENT_ACTION_REQUEST_START_TOR = "org.torproject.android.START_TOR"; - // for bridge loading from the assets default bridges.txt file - class Bridge - { - String type; - String config; - } - - private ArrayList<Bridge> alBridges = null; - //this is needed for backwards compat back to Android 2.3.* @SuppressLint("NewApi") public View onCreateView(View parent, String name, Context context, AttributeSet attrs) @@ -434,6 +425,9 @@ public class OrbotMainActivity extends AppCompatActivity } }); + + ((TextView)findViewById(R.id.torInfo)).setText("Tor v" + TorServiceConstants.BINARY_TOR_VERSION); + } GestureDetector mGestureDetector; @@ -1034,8 +1028,6 @@ public class OrbotMainActivity extends AppCompatActivity public void promptSetupBridges () { - loadBridgeDefaults(); - LayoutInflater li = LayoutInflater.from(this); View view = li.inflate(R.layout.layout_diag, null); @@ -1055,17 +1047,17 @@ public class OrbotMainActivity extends AppCompatActivity switch (which) { case 0: //obfs 4; - setupBridgeType("obfs4"); + Prefs.setBridgesList("obfs4"); enableBridges(true); break; case 1: //azure - Prefs.setBridgesList("2"); + Prefs.setBridgesList("meek"); enableBridges(true); break; case 2: //amazon - Prefs.setBridgesList("1"); + Prefs.setBridgesList("meek"); enableBridges(true); break; @@ -1523,76 +1515,5 @@ public class OrbotMainActivity extends AppCompatActivity } } - private void loadBridgeDefaults () - { - if (alBridges == null) - { - alBridges = new ArrayList<Bridge>(); - - try - { - BufferedReader in= - new BufferedReader(new InputStreamReader(getAssets().open("bridges.txt"), "UTF-8")); - String str; - - while ((str=in.readLine()) != null) { - - StringTokenizer st = new StringTokenizer (str," "); - Bridge b = new Bridge(); - b.type = st.nextToken(); - - StringBuffer sbConfig = new StringBuffer(); - - while(st.hasMoreTokens()) - sbConfig.append(st.nextToken()).append(' '); - - b.config = sbConfig.toString().trim(); - - alBridges.add(b); - - } - - in.close(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - } - - private void setupBridgeType (String type) - { - StringBuffer sbConfig = new StringBuffer (); - - //we should randomly sort alBridges so we don't have the same bridge order each time - long seed = System.nanoTime(); - Collections.shuffle(alBridges, new Random(seed)); - - //let's just pull up to 2 bridges from the defaults at time - int maxBridges = 2; - int bridgeCount = 0; - - //now go through the list to find the bridges we want - for (Bridge b : alBridges) - { - if (b.type.equals(type)) - { - - sbConfig.append(b.type); - sbConfig.append(' '); - sbConfig.append(b.config); - - bridgeCount++; - - if (bridgeCount == maxBridges) - break; - else - sbConfig.append("\n"); - } - } - - setNewBridges(sbConfig.toString()); - } + }

1 0

[orbot/master] add version display to sidebar
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit 301ef3948ef33bb41efd6464ce0f76dbd5a4bbbd Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 22 12:46:48 2017 -0400 add version display to sidebar --- app/src/main/res/layout/layout_orbot_control.xml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/layout_orbot_control.xml b/app/src/main/res/layout/layout_orbot_control.xml index f7d15d8..bfe50cd 100644 --- a/app/src/main/res/layout/layout_orbot_control.xml +++ b/app/src/main/res/layout/layout_orbot_control.xml @@ -107,7 +107,24 @@ /> </RelativeLayout> - + <RelativeLayout + 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/torInfo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:text="" + android:textSize="15sp" + android:gravity="center_vertical" + android:fontFamily="sans-serif-light" /> + </RelativeLayout> </LinearLayout>

1 0

[orbot/master] update obfs4 bridges to match latest from tor browser
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit b8aaa2c7d9c7a135ed120dd9fb42d3f5d86df078 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Mar 19 23:21:49 2017 -0400 update obfs4 bridges to match latest from tor browser --- orbotservice/src/main/assets/bridges.txt | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/orbotservice/src/main/assets/bridges.txt b/orbotservice/src/main/assets/bridges.txt index 8ceb5db..77994bb 100644 --- a/orbotservice/src/main/assets/bridges.txt +++ b/orbotservice/src/main/assets/bridges.txt @@ -3,18 +3,25 @@ obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A +obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0 obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0 -obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0 -obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0 -obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0 -obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0 -obfs4 154.35.22.10:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0 -obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 +obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0 +obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1 +obfs4 83.212.101.3:50002 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0 +obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2 +obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0 obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 -obfs4 154.35.22.10:1984 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0 -obfs4 154.35.22.11:1984 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 -obfs4 154.35.22.12:1984 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0 -obfs4 154.35.22.13:1984 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 +obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0 +obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0 +obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 +obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 +obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0 +obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0 +obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0 +obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0 +obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 +obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1 +obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0 meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[orbot/master] update constants for Tor 0.3.0 RC
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit 1d3a99ea6c4978ed43b9f9e424c6ceeccf0d6d76 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Mar 19 23:15:51 2017 -0400 update constants for Tor 0.3.0 RC --- .../org/torproject/android/service/TorServiceConstants.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) 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 5f2145c..740bb9d 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -135,7 +135,7 @@ public interface TorServiceConstants { public static final String CMD_UPDATE_TRANS_PROXY = "update"; public static final String CMD_SET_EXIT = "setexit"; - public static final String BINARY_TOR_VERSION = "0.2.9.9-openssl1.0.2k"; + public static final String BINARY_TOR_VERSION = "0.3.0-openssl1.0.2k-1"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy @@ -151,14 +151,7 @@ public interface TorServiceConstants { //EXIT COUNTRY CODES public final static String[] COUNTRY_CODES = {"DE","AT","SE","CH","IS","CA","US","ES","FR","BG","PL","AU","BR","CZ","DK","FI","GB","HU","NL","JP","RO","RU","SG","SK"}; - - //MEEK BRIDGEs - public final static String[] BRIDGES_MEEK = - { - "meek_lite 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com", - "meek_lite 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com", - "meek_lite 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com" - }; + public static final String HIDDEN_SERVICES_DIR = "hidden_services";

1 0

[orbot/master] update notification styling
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit 5b9a34199e918280ff568d48fc5b4967d99475bd Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 22 12:58:34 2017 -0400 update notification styling --- .../main/res/layout-v21/layout_notification_expanded.xml | 7 ++++--- app/src/main/res/layout/layout_notification_expanded.xml | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app/src/main/res/layout-v21/layout_notification_expanded.xml b/app/src/main/res/layout-v21/layout_notification_expanded.xml index e5a75ef..71770d0 100644 --- a/app/src/main/res/layout-v21/layout_notification_expanded.xml +++ b/app/src/main/res/layout-v21/layout_notification_expanded.xml @@ -18,8 +18,8 @@ xmlns:internal="http://schemas.android.com/apk/prv/res/android" android:id="@+id/status_bar_latest_event_content" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#333333" + android:layout_height="wrap_content" + android:background="#545454" > <ImageView android:id="@+id/icon" android:layout_width="@dimen/notification_large_icon_width" @@ -117,7 +117,8 @@ android:layout_marginTop="-2dp" android:layout_marginBottom="-2dp" android:layout_marginStart="8dp" - android:fadingEdge="horizontal" + android:fadingEdge="horizontal" + android:textColor="#cdcdcd" /> </LinearLayout> </FrameLayout> diff --git a/app/src/main/res/layout/layout_notification_expanded.xml b/app/src/main/res/layout/layout_notification_expanded.xml index c2a9c9e..9f72beb 100644 --- a/app/src/main/res/layout/layout_notification_expanded.xml +++ b/app/src/main/res/layout/layout_notification_expanded.xml @@ -29,10 +29,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="fill_vertical" - android:layout_marginStart="@dimen/notification_large_icon_width" + android:layout_marginLeft="@dimen/notification_large_icon_width" android:minHeight="@dimen/notification_large_icon_height" android:orientation="vertical" - android:paddingEnd="8dp" + android:paddingLeft="8dp" android:paddingTop="2dp" android:paddingBottom="2dp" android:gravity="top" @@ -42,7 +42,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="6dp" - android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" android:orientation="horizontal" > <TextView android:id="@+id/title" @@ -62,7 +62,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" > <TextView android:id="@+id/text" android:layout_width="0dp" @@ -81,7 +81,7 @@ android:layout_weight="0" android:singleLine="true" android:gravity="center" - android:paddingStart="8dp" + android:paddingLeft="8dp" android:textAppearance="@style/NotificationText" /> <ImageView android:id="@+id/right_icon" @@ -89,7 +89,7 @@ android:layout_height="16dp" android:layout_gravity="center" android:layout_weight="0" - android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" android:scaleType="centerInside" android:visibility="gone" /> @@ -115,7 +115,7 @@ android:layout_height="wrap_content" android:layout_marginTop="-2dp" android:layout_marginBottom="-2dp" - android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" android:fadingEdge="horizontal" /> </LinearLayout>

1 0

[orbot/master] update pluto library
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit 7eb7a76bbe449035bc3f84778bfb1f5768f137e5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 6 01:17:25 2017 -0500 update pluto library --- external/pluto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/pluto b/external/pluto index 9ca531b..b3f330b 160000 --- a/external/pluto +++ b/external/pluto @@ -1 +1 @@ -Subproject commit 9ca531b8568a2c1a945568a0c46354da7a7371c5 +Subproject commit b3f330b15bf5f199b5114b11c93dec818feade04

1 0

[orbot/master] update logic for bridge selection
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit 4af61b609ed0481dbe1b2545cf44e03a02c05a34 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 22 12:47:05 2017 -0400 update logic for bridge selection --- .../org/torproject/android/service/TorService.java | 162 ++++++++++++++------- 1 file changed, 112 insertions(+), 50 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 9a3e44c..83de202 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -61,15 +61,18 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.InputStreamReader; import java.io.PrintStream; import java.io.PrintWriter; import java.net.Socket; import java.text.Normalizer; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Properties; +import java.util.Random; import java.util.Set; import java.util.StringTokenizer; import java.util.concurrent.ExecutorService; @@ -132,6 +135,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private Shell mShellPolipo; + private ArrayList<Bridge> alBridges = null; + + private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers/hs"); private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers.cookie/cookie"); @@ -1665,31 +1671,29 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } else { - + + loadBridgeDefaults (); extraLines.append("UseBridges 1").append('\n'); String bridgeList = new String(Prefs.getBridgesList().getBytes("ISO-8859-1")); - - if (bridgeList != null && bridgeList.length() > 1) //longer then 1 = some real values here + boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4"); + boolean meekBridges = bridgeList.contains("meek"); + + //check if any PT bridges are needed + if (obfsBridges) + { + extraLines.append("ClientTransportPlugin obfs3 exec " + fileObfsclient.getCanonicalPath()).append('\n'); + extraLines.append("ClientTransportPlugin obfs4 exec " + fileObfsclient.getCanonicalPath()).append('\n'); + } + + if (meekBridges) + { + extraLines.append("ClientTransportPlugin meek_lite exec " + fileObfsclient.getCanonicalPath()).append('\n'); + } + + if (bridgeList != null && bridgeList.length() > 5) //longer then 1 = some real values here { - - //check if any PT bridges are needed - boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit"); - - if (obfsBridges) - { - extraLines.append("ClientTransportPlugin obfs3 exec " + fileObfsclient.getCanonicalPath()).append('\n'); - extraLines.append("ClientTransportPlugin obfs4 exec " + fileObfsclient.getCanonicalPath()).append('\n'); - extraLines.append("ClientTransportPlugin scramblesuit exec " + fileObfsclient.getCanonicalPath()).append('\n'); - } - - boolean meekBridges = bridgeList.contains("meek"); - if (meekBridges) - { - extraLines.append("ClientTransportPlugin meek_lite exec " + fileObfsclient.getCanonicalPath()).append('\n'); - } - String[] bridgeListLines = bridgeList.split("\\r?\\n"); for (String bridgeConfigLine : bridgeListLines) @@ -1697,9 +1701,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (!TextUtils.isEmpty(bridgeConfigLine)) { extraLines.append("Bridge "); - - //bridgeConfigLine = bridgeConfigLine.replace('�', ' '); - + StringTokenizer st = new StringTokenizer (bridgeConfigLine," "); while (st.hasMoreTokens()) extraLines.append(st.nextToken()).append(' '); @@ -1713,34 +1715,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } else { - //time to do autobridges, aka meek - debug ("Using meek bridges"); - - // String bridgeConfig = "meek exec " + fileMeekclient.getCanonicalPath(); - String bridgeConfig = "meek_lite exec " + fileObfsclient.getCanonicalPath(); - - extraLines.append("ClientTransportPlugin" + ' ' + bridgeConfig).append('\n'); - - int meekIdx = 2; //let's use Azure by default - - if (bridgeList != null && bridgeList.length() == 1) - { - try - { - meekIdx = Integer.parseInt(bridgeList); - - if (meekIdx+1 > BRIDGES_MEEK.length) - throw new Exception("not valid meek idx"); - } - catch (Exception e) - { - debug("invalid meek type; please enter 0=Google, 1=AWS, 2=Azure"); - } - } - - extraLines.append("Bridge " + BRIDGES_MEEK[meekIdx]).append('\n'); - + String type = "obfs4"; + + if (meekBridges) + type = "meek_lite"; + + getBridges(type,extraLines); + } } @@ -2063,4 +2045,84 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } + + // for bridge loading from the assets default bridges.txt file + class Bridge + { + String type; + String config; + } + + + private void loadBridgeDefaults () + { + if (alBridges == null) + { + alBridges = new ArrayList<Bridge>(); + + try + { + BufferedReader in= + new BufferedReader(new InputStreamReader(getAssets().open("bridges.txt"), "UTF-8")); + String str; + + while ((str=in.readLine()) != null) { + + StringTokenizer st = new StringTokenizer (str," "); + Bridge b = new Bridge(); + b.type = st.nextToken(); + + StringBuffer sbConfig = new StringBuffer(); + + while(st.hasMoreTokens()) + sbConfig.append(st.nextToken()).append(' '); + + b.config = sbConfig.toString().trim(); + + alBridges.add(b); + + } + + in.close(); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + } + + //we should randomly sort alBridges so we don't have the same bridge order each time + Random bridgeSelectRandom = new Random(System.nanoTime()); + + private void getBridges (String type, StringBuffer extraLines) + { + + Collections.shuffle(alBridges, bridgeSelectRandom); + + //let's just pull up to 2 bridges from the defaults at time + int maxBridges = 2; + int bridgeCount = 0; + + //now go through the list to find the bridges we want + for (Bridge b : alBridges) + { + if (b.type.equals(type)) + { + extraLines.append("Bridge "); + extraLines.append(b.type); + extraLines.append(' '); + extraLines.append(b.config); + extraLines.append('\n'); + + bridgeCount++; + + if (bridgeCount > maxBridges) + break; + } + } + + } + }

1 0

[orbot/master] modify notification display
by n8fr8＠torproject.org 22 Mar '17

22 Mar '17

commit 7dbae837dedd90f3dbc1b6eafc8ef00c794234fd Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 22 12:47:54 2017 -0400 modify notification display --- .../main/res/layout-v21/layout_notification_expanded.xml | 4 ++-- .../src/main/res/layout/layout_notification_expanded.xml | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/layout-v21/layout_notification_expanded.xml b/app/src/main/res/layout-v21/layout_notification_expanded.xml index 179b95e..e5a75ef 100644 --- a/app/src/main/res/layout-v21/layout_notification_expanded.xml +++ b/app/src/main/res/layout-v21/layout_notification_expanded.xml @@ -73,7 +73,7 @@ android:singleLine="true" android:ellipsize="marquee" android:fadingEdge="horizontal" - android:textAppearance="@style/NotificationText" + android:textAppearance="@style/NotificationTitle" /> <TextView android:id="@+id/info" android:layout_width="wrap_content" @@ -83,7 +83,7 @@ android:singleLine="true" android:gravity="center" android:paddingStart="8dp" - android:textAppearance="@style/NotificationText" + android:textAppearance="@style/NotificationTitle" /> <ImageView android:id="@+id/right_icon" android:layout_width="16dp" diff --git a/orbotservice/src/main/res/layout/layout_notification_expanded.xml b/orbotservice/src/main/res/layout/layout_notification_expanded.xml index c2a9c9e..395998b 100644 --- a/orbotservice/src/main/res/layout/layout_notification_expanded.xml +++ b/orbotservice/src/main/res/layout/layout_notification_expanded.xml @@ -30,9 +30,12 @@ android:layout_height="wrap_content" android:layout_gravity="fill_vertical" android:layout_marginStart="@dimen/notification_large_icon_width" + android:layout_marginLeft="@dimen/notification_large_icon_width" + android:minHeight="@dimen/notification_large_icon_height" android:orientation="vertical" android:paddingEnd="8dp" + android:paddingRight="8dp" android:paddingTop="2dp" android:paddingBottom="2dp" android:gravity="top" @@ -43,6 +46,7 @@ android:layout_height="wrap_content" android:paddingTop="6dp" android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" android:orientation="horizontal" > <TextView android:id="@+id/title" @@ -53,7 +57,6 @@ android:fadingEdge="horizontal" android:layout_weight="1" android:textStyle="bold" - android:textAppearance="@style/NotificationTitle" /> </LinearLayout> @@ -62,7 +65,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_marginStart="8dp" + android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" > <TextView android:id="@+id/text" android:layout_width="0dp" @@ -72,7 +76,6 @@ android:singleLine="true" android:ellipsize="marquee" android:fadingEdge="horizontal" - android:textAppearance="@style/NotificationText" /> <TextView android:id="@+id/info" android:layout_width="wrap_content" @@ -82,14 +85,14 @@ android:singleLine="true" android:gravity="center" android:paddingStart="8dp" - android:textAppearance="@style/NotificationText" + android:paddingLeft="8dp" /> <ImageView android:id="@+id/right_icon" android:layout_width="16dp" android:layout_height="16dp" android:layout_gravity="center" android:layout_weight="0" - android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" android:scaleType="centerInside" android:visibility="gone" /> @@ -115,7 +118,8 @@ android:layout_height="wrap_content" android:layout_marginTop="-2dp" android:layout_marginBottom="-2dp" - android:layout_marginStart="8dp" + android:layout_marginStart="8dp" + android:layout_marginLeft="8dp" android:fadingEdge="horizontal" /> </LinearLayout>

1 0