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

[orbot/master] toUpperCase -> compareToIgnoreCase
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 1c9afcbafe898779fb91483fe32851e850d605b9 Author: lexi <bird.s.lex(a)gmail.com> Date: Fri Apr 13 14:55:28 2018 -0400 toUpperCase -> compareToIgnoreCase --- app/src/main/java/org/torproject/android/ui/AppManagerActivity.java | 2 +- .../src/main/java/org/torproject/android/service/vpn/TorifiedApp.java | 2 +- 2 files changed, 2 insertions(+), 2 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 17e39ccd..2f60a40c 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -135,7 +135,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList would likely not expect to find them. */ if (o1.isTorified() == o2.isTorified()) - return o1.getName().toUpperCase().compareTo(o2.getName().toUpperCase()); + return o1.getName().compareToIgnoreCase(o2.getName()); if (o1.isTorified()) return -1; return 1; } diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java index 1276f2f6..cb60e442 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java @@ -133,7 +133,7 @@ public class TorifiedApp implements Comparable { @Override public int compareTo(Object another) { - return this.toString().toUpperCase().compareTo(another.toString().toUpperCase()); + return this.toString().compareToIgnoreCase(another.toString()); } @Override

1 0

[orbot/master] switch to 1.1.1.1 for default DNS
by n8fr8＠torproject.org 12 May '18

12 May '18

commit bae861e3b3a7eaa1eb416e19dc1ba9e02a68f33f Author: n8fr8 <nathan(a)freitas.net> Date: Fri Apr 20 00:10:56 2018 -0400 switch to 1.1.1.1 for default DNS --- .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index bbae15ea..e3927d5b 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -300,7 +300,7 @@ public class OrbotVpnManager implements Handler.Callback { final String virtualGateway = "10.10.10.1"; final String virtualIP = "10.10.10.2"; final String virtualNetMask = "255.255.255.0"; - final String dummyDNS = "8.8.8.8"; //this is intercepted by the tun2socks library, but we must put in a valid DNS to start + final String dummyDNS = "1.1.1.1"; //this is intercepted by the tun2socks library, but we must put in a valid DNS to start final String defaultRoute = "0.0.0.0"; final String localSocks = localhost + ':'

1 0

[orbot/master] update gradle, SDK, dependencies, etc
by n8fr8＠torproject.org 12 May '18

12 May '18

commit f2c3753a0a41047e9b68dae747ffdb3d4b0a7023 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Apr 20 00:09:40 2018 -0400 update gradle, SDK, dependencies, etc --- app/build.gradle | 25 +++++++++++++------------ build.gradle | 2 +- jsocksAndroid/build.gradle | 8 ++++---- orbotservice/build.gradle | 8 ++++---- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e5c8fe65..38d1a6d5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { applicationId "org.torproject.android" minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 27 } lintOptions { checkReleaseBuilds false @@ -24,6 +24,7 @@ android { flavorDimensions "free" productFlavors { + /** minimalperm { dimension "free" minSdkVersion 16 @@ -32,24 +33,24 @@ android { maxSdkVersion 23 versionCode 16000010 versionName '16.0.0-RC-2-multi-SDK16' - } + }**/ fullperm { dimension "free" - minSdkVersion 23 + minSdkVersion 16 applicationId 'org.torproject.android' - targetSdkVersion 26 + targetSdkVersion 27 versionCode 16000011 - versionName '16.0.0-RC-2-multi-SDK23' + versionName '16.0.0-RC-2-multi-SDK16' } } } dependencies { - implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support.constraint:constraint-layout:1.1.0' compile project(':orbotservice') - compile 'com.android.support:design:26.1.0' - compile 'pl.bclogic:pulsator4droid:1.0.3' - compile 'com.github.apl-devs:appintro:v4.2.2' - compile 'com.github.javiersantos:AppUpdater:2.6.4' + implementation 'com.android.support:design:27.1.1' + implementation 'pl.bclogic:pulsator4droid:1.0.3' + implementation 'com.github.apl-devs:appintro:v4.2.2' + implementation 'com.github.javiersantos:AppUpdater:2.6.4' } diff --git a/build.gradle b/build.gradle index ea835f91..8964b5f0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.1' } } diff --git a/jsocksAndroid/build.gradle b/jsocksAndroid/build.gradle index 12c743fd..7ac21e4e 100644 --- a/jsocksAndroid/build.gradle +++ b/jsocksAndroid/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' defaultConfig { - minSdkVersion 8 - targetSdkVersion 25 + minSdkVersion 16 + targetSdkVersion 27 } buildTypes { diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index d950d865..793d088d 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 26 - buildToolsVersion '26.0.2' + compileSdkVersion 27 + buildToolsVersion '27.0.3' sourceSets { main { @@ -13,7 +13,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 1 versionName "1.0" @@ -29,7 +29,7 @@ android { dependencies { compile project(':jsocksAndroid') compile 'org.torproject:tor-android-binary:0.3.1.9b' - compile 'com.android.support:appcompat-v7:26.1.0' + compile 'com.android.support:appcompat-v7:27.1.1' compile 'com.jrummyapps:android-shell:1.0.1' compile fileTree(dir: 'libs', include: ['*.jar','*.so']) testCompile 'junit:junit:4.12'

1 0

[orbot/master] Merge pull request #143 from bitmold/app-sorting-case-insensitive
by n8fr8＠torproject.org 12 May '18

12 May '18

commit d0cc453d5e1e82df48728dd5f983e73497677188 Merge: e244df96 1c9afcba Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 20 00:12:05 2018 -0400 Merge pull request #143 from bitmold/app-sorting-case-insensitive App sorting for TorifiedApps is case sensitive .../main/java/org/torproject/android/ui/AppManagerActivity.java | 7 ++++++- .../main/java/org/torproject/android/service/vpn/TorifiedApp.java | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-)

1 0

[orbot/master] Merge branch 'master' of github.com:n8fr8/orbot
by n8fr8＠torproject.org 12 May '18

12 May '18

commit e244df96affd48c32a5e91ccd097a2b1571db051 Merge: bae861e3 a4ce29db Author: n8fr8 <nathan(a)freitas.net> Date: Fri Apr 20 00:11:38 2018 -0400 Merge branch 'master' of github.com:n8fr8/orbot BUILD | 4 +++ INSTALL | 2 +- .../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 +++++++++++++++++----- 5 files changed, 52 insertions(+), 24 deletions(-)

1 0

[orbot/master] App sorting for TorifiedApps is case insensitive
by n8fr8＠torproject.org 12 May '18

12 May '18

commit 0675600505843058fd2aa6a4425b0f0ebb660808 Author: lexi <bird.s.lex(a)gmail.com> Date: Fri Apr 13 14:10:02 2018 -0400 App sorting for TorifiedApps is case insensitive --- .../main/java/org/torproject/android/ui/AppManagerActivity.java | 7 ++++++- .../main/java/org/torproject/android/service/vpn/TorifiedApp.java | 3 +-- 2 files changed, 7 insertions(+), 3 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 c3cdc5eb..17e39ccd 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -130,7 +130,12 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList Collections.sort(mApps,new Comparator<TorifiedApp>() { public int compare(TorifiedApp o1, TorifiedApp o2) { - if (o1.isTorified() == o2.isTorified()) return o1.getName().compareTo(o2.getName()); + /* Some apps start with lowercase letters and without the sorting being case + insensitive they'd appear at the end of the grid of apps, a position where users + would likely not expect to find them. + */ + if (o1.isTorified() == o2.isTorified()) + return o1.getName().toUpperCase().compareTo(o2.getName().toUpperCase()); if (o1.isTorified()) return -1; return 1; } diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java index c72ebe3b..1276f2f6 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorifiedApp.java @@ -133,8 +133,7 @@ public class TorifiedApp implements Comparable { @Override public int compareTo(Object another) { - - return this.toString().compareTo(another.toString()); + return this.toString().toUpperCase().compareTo(another.toString().toUpperCase()); } @Override

1 0

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

12 May '18

commit 923be64f633ff62c90c11904fe9533b221387b44 Merge: d1daf86c 47e05343 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 20 00:12:47 2018 -0400 Merge pull request #129 from bitmold/patch-2 Removed Outdated FAQ in README README | 1 - 1 file changed, 1 deletion(-)

1 0

[orbot/master] Merge pull request #141 from bitmold/no-phone-state-perm
by n8fr8＠torproject.org 12 May '18

12 May '18

commit d1daf86cd177bf3bb2cf07be8c85946c2884e092 Merge: d0cc453d 505223b3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 20 00:12:26 2018 -0400 Merge pull request #141 from bitmold/no-phone-state-perm removed legacy READ_PHONE_STATE perm app/src/fullperm/AndroidManifest.xml | 1 - docs/WALKTHROUGH | 5 ----- 2 files changed, 6 deletions(-)

1 0

[orbot/master] Merge pull request #139 from bitmold/back-closes-log-not-app
by n8fr8＠torproject.org 12 May '18

12 May '18

commit fdd6b52f56ede35671cedcee38e462a1a5d60777 Merge: f151b37c 87401d04 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 20 00:13:44 2018 -0400 Merge pull request #139 from bitmold/back-closes-log-not-app When the Tor log is open, pressing back will close it instead of Orbot .../java/org/torproject/android/OrbotMainActivity.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)

1 0

[orbot/master] Merge pull request #127 from bitmold/string-fixes
by n8fr8＠torproject.org 12 May '18

12 May '18

commit f151b37ce1790120e962708ee7127e5e742f2991 Merge: 923be64f 0eaa2786 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 20 00:13:12 2018 -0400 Merge pull request #127 from bitmold/string-fixes Some UI String Fixes app/src/main/java/org/torproject/android/OrbotMainActivity.java | 4 ++-- app/src/main/res/values-az/strings.xml | 2 +- app/src/main/res/values-bg/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 2 +- app/src/main/res/values-cs-rCZ/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es-rAR/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-et/strings.xml | 2 +- app/src/main/res/values-eu/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 2 +- app/src/main/res/values-he/strings.xml | 2 +- app/src/main/res/values-hr/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-id/strings.xml | 2 +- app/src/main/res/values-in-rID/strings.xml | 2 +- app/src/main/res/values-is/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-lv/strings.xml | 2 +- app/src/main/res/values-mk/strings.xml | 2 +- app/src/main/res/values-ms-rMY/strings.xml | 2 +- app/src/main/res/values-ms/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 4 ++-- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-si-rLK/strings.xml | 2 +- app/src/main/res/values-sk/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-th/strings.xml | 2 +- app/src/main/res/values-tl/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 4 ++-- orbotservice/src/main/res/values-az/strings.xml | 2 +- orbotservice/src/main/res/values-bg/strings.xml | 2 +- orbotservice/src/main/res/values-ca/strings.xml | 2 +- orbotservice/src/main/res/values-cs-rCZ/strings.xml | 2 +- orbotservice/src/main/res/values-da/strings.xml | 2 +- orbotservice/src/main/res/values-el/strings.xml | 2 +- orbotservice/src/main/res/values-es/strings.xml | 2 +- orbotservice/src/main/res/values-et/strings.xml | 2 +- orbotservice/src/main/res/values-eu/strings.xml | 2 +- orbotservice/src/main/res/values-fi/strings.xml | 2 +- orbotservice/src/main/res/values-gl/strings.xml | 2 +- orbotservice/src/main/res/values-hr/strings.xml | 2 +- orbotservice/src/main/res/values-hu/strings.xml | 2 +- orbotservice/src/main/res/values-id/strings.xml | 2 +- orbotservice/src/main/res/values-in-rID/strings.xml | 2 +- orbotservice/src/main/res/values-is/strings.xml | 2 +- orbotservice/src/main/res/values-it/strings.xml | 2 +- orbotservice/src/main/res/values-ja/strings.xml | 2 +- orbotservice/src/main/res/values-lv/strings.xml | 2 +- orbotservice/src/main/res/values-mk/strings.xml | 2 +- orbotservice/src/main/res/values-ms-rMY/strings.xml | 2 +- orbotservice/src/main/res/values-ms/strings.xml | 2 +- orbotservice/src/main/res/values-nb/strings.xml | 2 +- orbotservice/src/main/res/values-nl/strings.xml | 2 +- orbotservice/src/main/res/values-pl/strings.xml | 2 +- orbotservice/src/main/res/values-pt-rBR/strings.xml | 2 +- orbotservice/src/main/res/values-ro/strings.xml | 2 +- orbotservice/src/main/res/values-si-rLK/strings.xml | 2 +- orbotservice/src/main/res/values-sv/strings.xml | 2 +- orbotservice/src/main/res/values-th/strings.xml | 2 +- orbotservice/src/main/res/values-tl/strings.xml | 2 +- orbotservice/src/main/res/values-vi/strings.xml | 2 +- orbotservice/src/main/res/values-zh-rCN/strings.xml | 2 +- orbotservice/src/main/res/values/strings.xml | 2 +- 72 files changed, 75 insertions(+), 75 deletions(-)

1 0