May 2018 - tor-commits - lists.torproject.org

[orbot/master] Merge pull request #124 from goapunk/fix_asset_pdnsd
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 64f90ed5335d82336fd8c7cd48dbdd4b50aebe05 Merge: fb912d79 3b7aafd8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 27 15:05:40 2018 -0500 Merge pull request #124 from goapunk/fix_asset_pdnsd Fix lost asset: orbotservice/src/main/jni/Android.mk | 7 +++++++ 1 file changed, 7 insertions(+)

1 0

[orbot/master] Fix TextView overlap issues in app selection ui
by n8fr8＠torproject.org 12 May '18

12 May '18

commit ebc06ca3fe029edc01976b38b776c613f680198e Author: lexi <bird.s.lex(a)gmail.com> Date: Mon Feb 26 14:18:25 2018 -0500 Fix TextView overlap issues in app selection ui --- .../torproject/android/ui/AppManagerActivity.java | 1 + app/src/main/res/layout/layout_apps.xml | 4 ++- app/src/main/res/layout/layout_apps_item.xml | 34 +++++++++++++++++----- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java index 6d29a85f..c3cdc5eb 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -23,6 +23,7 @@ import android.content.SharedPreferences.Editor; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.graphics.Color; import android.os.AsyncTask; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; diff --git a/app/src/main/res/layout/layout_apps.xml b/app/src/main/res/layout/layout_apps.xml index e597163f..1be50435 100644 --- a/app/src/main/res/layout/layout_apps.xml +++ b/app/src/main/res/layout/layout_apps.xml @@ -17,7 +17,9 @@ android:layout_height="match_parent" android:layout_alignParentTop="true" android:gravity="center" - android:numColumns="4"> + android:horizontalSpacing="5dp" + android:numColumns="4" + android:verticalSpacing="5dp"> </GridView> diff --git a/app/src/main/res/layout/layout_apps_item.xml b/app/src/main/res/layout/layout_apps_item.xml index 83549121..ef188b3e 100644 --- a/app/src/main/res/layout/layout_apps_item.xml +++ b/app/src/main/res/layout/layout_apps_item.xml @@ -1,15 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="120dp" - android:layout_height="120dp" - android:orientation="vertical" + android:layout_width="90dp" + android:layout_height="90dp" android:gravity="center_horizontal" - > - <ImageView android:id="@+id/itemicon" android:layout_width="50dp" android:layout_height="50dp" android:padding="3dp" ></ImageView> - <TextView android:layout_height="20dp" android:layout_width="120dp" android:lines="1" android:id="@+id/itemtext" - android:text="uid:packages" android:textSize="12sp" android:gravity="center_horizontal" android:padding="3dip"></TextView> - <CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/itemcheck" ></CheckBox> + android:orientation="vertical"> + + <ImageView + android:id="@+id/itemicon" + android:layout_width="40dp" + android:layout_height="40dp" /> + + <TextView + android:id="@+id/itemtext" + android:layout_width="80dp" + android:layout_height="wrap_content" + android:ellipsize="end" + android:gravity="center_horizontal" + android:maxLines="2" + android:minLines="2" + android:scrollHorizontally="false" + android:text="uid:packages" + android:textAlignment="center" + android:textSize="12sp" /> + + <CheckBox + android:id="@+id/itemcheck" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> </LinearLayout>

1 0

[orbot/master] Merge pull request #125 from bitmold/patch-1
by n8fr8＠torproject.org 12 May '18

12 May '18

commit eddcba62885f4ba1c35334a792022d5d4da06543 Merge: 64f90ed5 4b36bcef Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 27 15:05:58 2018 -0500 Merge pull request #125 from bitmold/patch-1 "Android" was used instead of "Orbot" in INSTALL INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] ..,. -> ... in strings nl
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 0eaa27860fcea19bfa8fcbf7d92f8ecf01bea9e5 Author: lexi <bird.s.lex(a)gmail.com> Date: Tue Mar 6 16:15:10 2018 -0500 ..,. -> ... in strings nl --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 703e96cd..7f4f2fad 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -277,7 +277,7 @@ <string name="bridges_updated">Bridges bijgewerkt</string> <string name="restart_orbot_to_use_this_bridge_">Herstart Orbot om de wijzigingen in te schakelen</string> <string name="menu_qr">QR-codes</string> - <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Als je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' gebruiken als alternatieve toegang. SELECTEER een van de opties om te configureren en te testen..,.</string> + <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Als je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' gebruiken als alternatieve toegang. SELECTEER een van de opties om te configureren en te testen...</string> <string name="bridge_mode">Bridge-modus</string> <string name="get_bridges_email">E-mail</string> <string name="get_bridges_web">Web</string>

1 0

[orbot/master] revert, pushed this to the wrong branch, sorry
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 60307735480d3ba7db2dda7498a41e4a2762036c Author: lexi <bird.s.lex(a)gmail.com> Date: Tue Mar 6 16:13:56 2018 -0500 revert, pushed this to the wrong branch, sorry --- app/src/main/res/values-nl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d3d3cf53..1b2edbe7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -277,7 +277,7 @@ <string name="bridges_updated">Bridges bijgewerkt</string> <string name="restart_orbot_to_use_this_bridge_">Herstart Orbot om de wijzigingen in te schakelen</string> <string name="menu_qr">QR-codes</string> - <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Als je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' gebruiken als alternatieve toegang. SELECTEER een van de opties om te configureren en te testen...</string> + <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Als je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' gebruiken als alternatieve toegang. SELECTEER een van de opties om te configureren en te testen..,.</string> <string name="bridge_mode">Bridge-modus</string> <string name="get_bridges_email">E-mail</string> <string name="get_bridges_web">Web</string>

1 0

[orbot/master] Removed Outdated FAQ in README
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 47e053431a313060a3c5614a19888a62aced4a61 Author: lex <bird.s.lex(a)gmail.com> Date: Wed Mar 7 15:07:53 2018 -0500 Removed Outdated FAQ in README The link on https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ says "This FAQ has been migrated to General FAQ. The answers in this FAQ may be old, incorrect, or obsolete." It tells visitors to see the other FAQ that is already linked in the README --- README | 1 - 1 file changed, 1 deletion(-) diff --git a/README b/README index fcfcf5e6..9e48f07e 100644 --- a/README +++ b/README @@ -18,7 +18,6 @@ is reasonably secure, but please ensure you read the instructions and configure it properly. Learn more at https://torproject.org/ Tor Frequently Asked Questions: - https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ https://www.torproject.org/faq.html.en ***********************************************

1 0

[orbot/master] Revert "Fix lost asset:"
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 40391ba7ac490d8803e4b70efe8cbd401e866b8d Author: goapunk <goapunk(a)riseup.net> Date: Sat Mar 10 17:01:41 2018 +0100 Revert "Fix lost asset:" This reverts commit 3b7aafd843f047988157220341970bd18f0beb42. --- orbotservice/src/main/jni/Android.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/orbotservice/src/main/jni/Android.mk b/orbotservice/src/main/jni/Android.mk index d7630409..c4448dbc 100644 --- a/orbotservice/src/main/jni/Android.mk +++ b/orbotservice/src/main/jni/Android.mk @@ -31,13 +31,6 @@ LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd -DHAVE_STPCPY include $(BUILD_EXECUTABLE) -.PHONY: $(CopyToAssets) - -CopyToAssets: libs/armeabi/pdnsd - $(shell mkdir -p assets/armeabi) - $(shell zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd) - - ######################################################## ## libancillary ########################################################

1 0

[orbot/master] Fix BUILD instructions
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 285373d276ed4cd2438059bb62013694a56ee72c Author: goapunk <goapunk(a)riseup.net> Date: Sat Mar 10 17:06:25 2018 +0100 Fix BUILD instructions --- BUILD | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BUILD b/BUILD index 92a5f3bf..510cab32 100644 --- a/BUILD +++ b/BUILD @@ -23,6 +23,10 @@ You then need to run "ndk-build" from: cd orbotservice/src/main ndk-build + mkdir -p assets/armeabi + zip assets/armeabi/pdnsd.mp3 libs/armeabi/pdnsd + mkdir -p assets/x86 + zip assets/x86/pdnsd.mp3 libs/armeabi/pdnsd This isn't enough though and we'll now sew up the binary into a small package that will handle basic Tor controlling features.

1 0

[orbot/master] Merge pull request #126 from bitmold/vpn-app-selection-ui-improvements
by n8fr8＠torproject.org 12 May '18

12 May '18

commit d681dcedbfc73597bdd80b5a75e5bfc3c6a70409 Merge: c425f5fb 60307735 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Mar 20 16:00:29 2018 -0400 Merge pull request #126 from bitmold/vpn-app-selection-ui-improvements VPN App Selection UI Improvements .../torproject/android/ui/AppManagerActivity.java | 17 +++++------ app/src/main/res/layout/layout_apps.xml | 19 ++++++++---- app/src/main/res/layout/layout_apps_item.xml | 34 +++++++++++++++++----- 3 files changed, 47 insertions(+), 23 deletions(-)

1 0

[orbot/master] Merge pull request #131 from goapunk/master
by n8fr8＠torproject.org 12 May '18

12 May '18

commit c425f5fb3446a32d2566dd21977b97535a3ea64d Merge: eddcba62 285373d2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Mar 20 15:59:26 2018 -0400 Merge pull request #131 from goapunk/master Revert "fix assets" BUILD | 4 ++++ orbotservice/src/main/jni/Android.mk | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-)

1 0