July 2019 - tor-commits - lists.torproject.org

[orbot/master] Removed Constraint Layout Dependency
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 7d8e41a6efcfbc46932d71146b28606cbb500f2b Author: lexi <dsnake(a)protonmail.com> Date: Sat Mar 23 23:28:34 2019 -0400 Removed Constraint Layout Dependency It was unused and shaves off 0.1MB from the total APK size. --- app/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 726979c6..1f471ab5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,11 +67,9 @@ android { } dependencies { - implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation project(':orbotservice') implementation 'com.android.support:design:28.0.0' implementation 'pl.bclogic:pulsator4droid:1.0.3' implementation 'com.github.apl-devs:appintro:v4.2.2' implementation 'com.github.javiersantos:AppUpdater:2.6.4' - }

1 0

[orbot/master] Merge pull request #202 from bitmold/no_constraint_layout
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit cd6560fa344a3177f8f0361c8736595e6a17df72 Merge: a5d5c99f 8ed080f9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Mar 26 16:35:21 2019 -0400 Merge pull request #202 from bitmold/no_constraint_layout Removed Constraint Layout Dependency app/build.gradle | 2 -- 1 file changed, 2 deletions(-)

1 0

[orbot/master] Removed Unused Classes
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 5d04d418378a919f6b57fe3bb9514d12cc429079 Author: lexi <dnsake(a)protonmail.com> Date: Fri Mar 29 15:45:26 2019 -0400 Removed Unused Classes --- .../torproject/android/ui/ImageProgressView.java | 78 ---------------------- .../android/control/NullEventHandler.java | 18 ----- .../android/service/HiddenServiceManager.java | 25 ------- .../torproject/android/service/TorrcConfig.java | 33 --------- .../android/control/NullEventHandler.java | 18 ----- 5 files changed, 172 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/ImageProgressView.java b/app/src/main/java/org/torproject/android/ui/ImageProgressView.java deleted file mode 100644 index 641c4446..00000000 --- a/app/src/main/java/org/torproject/android/ui/ImageProgressView.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.torproject.android.ui; - -import java.util.Random; - -import android.content.Context; -import android.graphics.Canvas; -import android.graphics.Color; -import android.graphics.Paint; -import android.graphics.RectF; -import android.util.AttributeSet; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ImageView; - -public class ImageProgressView extends ImageView -{ - - private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); - - private float progress = 0f; // 0 to 1 - - private RectF circle; - - public ImageProgressView(Context context) { - super(context); - // TODO Auto-generated constructor stub - init(); - - } - - public ImageProgressView(Context context, AttributeSet attrs) { - super(context, attrs); - init(); - } - - public ImageProgressView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - - init(); - } - - private void init(){ - paint.setStyle(Paint.Style.STROKE); - paint.setColor(Color.GREEN); - paint.setAntiAlias(true); - paint.setStrokeWidth(20); - - } - - @Override - protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - super.onMeasure(widthMeasureSpec, heightMeasureSpec); - - setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), - MeasureSpec.getSize(heightMeasureSpec)); - - } - - @Override - protected void onDraw(Canvas canvas) { - - super.onDraw(canvas); - - if (circle == null) - { - circle = new RectF(getWidth()/2,getHeight()/2+getHeight()/8, getWidth()/3,getHeight()/3); - } - - float sweepAngle = 360f * progress; - - canvas.drawArc(circle, 0, sweepAngle, true, paint); - - } - - - - -} \ No newline at end of file diff --git a/orbotservice/src/main/java/org/torproject/android/control/NullEventHandler.java b/orbotservice/src/main/java/org/torproject/android/control/NullEventHandler.java deleted file mode 100644 index a2390e68..00000000 --- a/orbotservice/src/main/java/org/torproject/android/control/NullEventHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2005 Nick Mathewson, Roger Dingledine -// See LICENSE file for copying information -package org.torproject.android.control; - -/** - * Implementation of EventHandler that ignores all events. Useful - * when you only want to override one method. - */ -public class NullEventHandler implements EventHandler { - public void circuitStatus(String status, String circID, String path) {} - public void streamStatus(String status, String streamID, String target) {} - public void orConnStatus(String status, String orName) {} - public void bandwidthUsed(long read, long written) {} - public void newDescriptors(java.util.List<String> orList) {} - public void message(String severity, String msg) {} - public void unrecognized(String type, String msg) {} -} - diff --git a/orbotservice/src/main/java/org/torproject/android/service/HiddenServiceManager.java b/orbotservice/src/main/java/org/torproject/android/service/HiddenServiceManager.java deleted file mode 100644 index 6b0d32dc..00000000 --- a/orbotservice/src/main/java/org/torproject/android/service/HiddenServiceManager.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.torproject.android.service; - - -//list view with add/remove hidden services - user is prompted for port - -public class HiddenServiceManager { - -} -/* - * - * ## Once you have configured a hidden service, you can look at the -## contents of the file ".../hidden_service/hostname" for the address -## to tell people. -## -## HiddenServicePort x y:z says to redirect requests on port x to the -## address y:z. - -#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/hidden_service/ -#HiddenServicePort 80 127.0.0.1:80 - -#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/other_hidden_service/ -#HiddenServicePort 80 127.0.0.1:80 -#HiddenServicePort 22 127.0.0.1:22 -*/ - diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorrcConfig.java b/orbotservice/src/main/java/org/torproject/android/service/TorrcConfig.java deleted file mode 100644 index 92bfb9b9..00000000 --- a/orbotservice/src/main/java/org/torproject/android/service/TorrcConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.torproject.android.service; - -public class TorrcConfig { - -} - -/* - * GeoIPFile - */ -/* -HTTPProxy host[:port] -Tor will make all its directory requests through this host:port (or host:80 if port is not specified), rather than connecting directly to any directory servers. - -HTTPProxyAuthenticator username:password -If defined, Tor will use this username:password for Basic HTTP proxy authentication, as in RFC 2617. This is currently the only form of HTTP proxy authentication that Tor supports; feel free to submit a patch if you want it to support others. - -HTTPSProxy host[:port] -Tor will make all its OR (SSL) connections through this host:port (or host:443 if port is not specified), via HTTP CONNECT rather than connecting directly to servers. You may want to set FascistFirewall to restrict the set of ports you might try to connect to, if your HTTPS proxy only allows connecting to certain ports. - -HTTPSProxyAuthenticator username:password -If defined, Tor will use this username:password for Basic HTTPS proxy authentication, as in RFC 2617. This is currently the only form of HTTPS proxy authentication that Tor supports; feel free to submit a patch if you want it to support others. - -Socks4Proxy host[:port] -Tor will make all OR connections through the SOCKS 4 proxy at host:port (or host:1080 if port is not specified). - -Socks5Proxy host[:port] -Tor will make all OR connections through the SOCKS 5 proxy at host:port (or host:1080 if port is not specified). - -Socks5ProxyUsername username - -Socks5ProxyPassword password -If defined, authenticate to the SOCKS 5 server using username and password in accordance to RFC 1929. Both username and password must be between 1 and 255 characters. -*/ \ No newline at end of file diff --git a/orbotservice/src/test/java/org/torproject/android/control/NullEventHandler.java b/orbotservice/src/test/java/org/torproject/android/control/NullEventHandler.java deleted file mode 100644 index a2390e68..00000000 --- a/orbotservice/src/test/java/org/torproject/android/control/NullEventHandler.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2005 Nick Mathewson, Roger Dingledine -// See LICENSE file for copying information -package org.torproject.android.control; - -/** - * Implementation of EventHandler that ignores all events. Useful - * when you only want to override one method. - */ -public class NullEventHandler implements EventHandler { - public void circuitStatus(String status, String circID, String path) {} - public void streamStatus(String status, String streamID, String target) {} - public void orConnStatus(String status, String orName) {} - public void bandwidthUsed(long read, long written) {} - public void newDescriptors(java.util.List<String> orList) {} - public void message(String severity, String msg) {} - public void unrecognized(String type, String msg) {} -} -

1 0

[orbot/master] Merge pull request #210 from eighthave/fastlane
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 2fb7e05ac833bf4c30be599fe5bc3c419fd2c9c6 Merge: cd6560fa 57120100 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri May 10 13:59:50 2019 -0400 Merge pull request #210 from eighthave/fastlane Fastlane .gitignore | 7 +++++++ fastlane/Appfile | 1 + fastlane/Fastfile | 27 +++++++++++++++++++++++++++ metadata/{cs => cs-CZ}/short_description.txt | 0 metadata/{de => de-DE}/full_description.txt | 0 metadata/{de => de-DE}/short_description.txt | 0 metadata/{de => de-DE}/title.txt | 0 metadata/{el => el-GR}/short_description.txt | 0 metadata/{es => es-ES}/full_description.txt | 0 metadata/{fi => fi-FI}/short_description.txt | 0 metadata/{fr => fr-FR}/full_description.txt | 0 metadata/{hi => hi-IN}/short_description.txt | 0 metadata/{hu => hu-HU}/short_description.txt | 0 metadata/{it => it-IT}/short_description.txt | 0 metadata/{ja => ja-JP}/short_description.txt | 0 metadata/{ko => ko-KR}/short_description.txt | 0 metadata/{nl => nl-NL}/short_description.txt | 0 metadata/{no => no-NO}/short_description.txt | 0 metadata/{pl => pl-PL}/short_description.txt | 0 metadata/{ru => ru-RU}/short_description.txt | 0 metadata/{ru => ru-RU}/title.txt | 0 metadata/{sv => sv-SE}/short_description.txt | 0 metadata/{tr => tr-TR}/full_description.txt | 0 tools/check-fastlane-whitespace.py | 4 +++- 24 files changed, 38 insertions(+), 1 deletion(-)

1 0

[orbot/master] Merge branch 'master' into removed_obsolete_version_checks
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 4cee987c0fe9e7d38aeb10a33e7633830c68f98d Merge: d2feefdd 2fb7e05a Author: lexi <dsnake(a)protonmail.com> Date: Mon May 27 18:05:02 2019 -0400 Merge branch 'master' into removed_obsolete_version_checks .gitignore | 7 +++++++ fastlane/Appfile | 1 + fastlane/Fastfile | 27 +++++++++++++++++++++++++++ metadata/{cs => cs-CZ}/short_description.txt | 0 metadata/{de => de-DE}/full_description.txt | 0 metadata/{de => de-DE}/short_description.txt | 0 metadata/{de => de-DE}/title.txt | 0 metadata/{el => el-GR}/short_description.txt | 0 metadata/{es => es-ES}/full_description.txt | 0 metadata/{fi => fi-FI}/short_description.txt | 0 metadata/{fr => fr-FR}/full_description.txt | 0 metadata/{hi => hi-IN}/short_description.txt | 0 metadata/{hu => hu-HU}/short_description.txt | 0 metadata/{it => it-IT}/short_description.txt | 0 metadata/{ja => ja-JP}/short_description.txt | 0 metadata/{ko => ko-KR}/short_description.txt | 0 metadata/{nl => nl-NL}/short_description.txt | 0 metadata/{no => no-NO}/short_description.txt | 0 metadata/{pl => pl-PL}/short_description.txt | 0 metadata/{ru => ru-RU}/short_description.txt | 0 metadata/{ru => ru-RU}/title.txt | 0 metadata/{sv => sv-SE}/short_description.txt | 0 metadata/{tr => tr-TR}/full_description.txt | 0 tools/check-fastlane-whitespace.py | 4 +++- 24 files changed, 38 insertions(+), 1 deletion(-)

1 0

[orbot/master] rename all metadata locale dirs after the Fastlane/Play names
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 571201009410445043025ced6d0bd499d86e5856 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri May 10 15:43:28 2019 +0200 rename all metadata locale dirs after the Fastlane/Play names ```python import os googlePlayLocales = sorted(('af', 'am', 'ar', 'az-AZ', 'be', 'bg', 'bn-BD', 'ca', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-AU', 'en-CA', 'en-GB', 'en-IN', 'en-SG', 'en-US', 'en-ZA', 'es-419', 'es-ES', 'es-US', 'et', 'eu-ES', 'fa', 'fa-AE', 'fa-AF', 'fa-IR', 'fi-FI', 'fil', 'fr-CA', 'fr-FR', 'gl-ES', 'hi-IN', 'hr', 'hu-HU', 'hy-AM', 'id', 'is-IS', 'it-IT', 'iw-IL', 'ja-JP', 'ka-GE', 'kk', 'km-KH', 'kn-IN', 'ko-KR', 'ky-KG', 'lo-LA', 'lt', 'lv', 'mk-MK', 'ml-IN', 'mn-MN', 'mr-IN', 'ms', 'ms-MY', 'my-MM', 'ne-NP', 'nl-NL', 'no-NO', 'pa', 'pl-PL', 'pt-BR', 'pt-PT', 'rm', 'ro', 'ru-RU', 'si-LK', 'sk', 'sl', 'sr', 'sv-SE', 'sw', 'ta-IN', 'te-IN', 'th', 'tr-TR', 'uk', 'vi', 'zh-CN', 'zh-HK', 'zh-TW', 'zu')) os.chdir(os.path.join(os.path.dirname(__file__), '..', 'metadata')) for f in os.listdir(): if f in googlePlayLocales: continue else: for locale in googlePlayLocales: if locale.startswith(f): os.rename(f, locale) break ``` --- metadata/{cs => cs-CZ}/short_description.txt | 0 metadata/{de => de-DE}/full_description.txt | 0 metadata/{de => de-DE}/short_description.txt | 0 metadata/{de => de-DE}/title.txt | 0 metadata/{el => el-GR}/short_description.txt | 0 metadata/{es => es-ES}/full_description.txt | 0 metadata/{fi => fi-FI}/short_description.txt | 0 metadata/{fr => fr-FR}/full_description.txt | 0 metadata/{hi => hi-IN}/short_description.txt | 0 metadata/{hu => hu-HU}/short_description.txt | 0 metadata/{it => it-IT}/short_description.txt | 0 metadata/{ja => ja-JP}/short_description.txt | 0 metadata/{ko => ko-KR}/short_description.txt | 0 metadata/{nl => nl-NL}/short_description.txt | 0 metadata/{no => no-NO}/short_description.txt | 0 metadata/{pl => pl-PL}/short_description.txt | 0 metadata/{ru => ru-RU}/short_description.txt | 0 metadata/{ru => ru-RU}/title.txt | 0 metadata/{sv => sv-SE}/short_description.txt | 0 metadata/{tr => tr-TR}/full_description.txt | 0 tools/check-fastlane-whitespace.py | 4 +++- 21 files changed, 3 insertions(+), 1 deletion(-) diff --git a/metadata/cs/short_description.txt b/metadata/cs-CZ/short_description.txt similarity index 100% rename from metadata/cs/short_description.txt rename to metadata/cs-CZ/short_description.txt diff --git a/metadata/de/full_description.txt b/metadata/de-DE/full_description.txt similarity index 100% rename from metadata/de/full_description.txt rename to metadata/de-DE/full_description.txt diff --git a/metadata/de/short_description.txt b/metadata/de-DE/short_description.txt similarity index 100% rename from metadata/de/short_description.txt rename to metadata/de-DE/short_description.txt diff --git a/metadata/de/title.txt b/metadata/de-DE/title.txt similarity index 100% rename from metadata/de/title.txt rename to metadata/de-DE/title.txt diff --git a/metadata/el/short_description.txt b/metadata/el-GR/short_description.txt similarity index 100% rename from metadata/el/short_description.txt rename to metadata/el-GR/short_description.txt diff --git a/metadata/es/full_description.txt b/metadata/es-ES/full_description.txt similarity index 100% rename from metadata/es/full_description.txt rename to metadata/es-ES/full_description.txt diff --git a/metadata/fi/short_description.txt b/metadata/fi-FI/short_description.txt similarity index 100% rename from metadata/fi/short_description.txt rename to metadata/fi-FI/short_description.txt diff --git a/metadata/fr/full_description.txt b/metadata/fr-FR/full_description.txt similarity index 100% rename from metadata/fr/full_description.txt rename to metadata/fr-FR/full_description.txt diff --git a/metadata/hi/short_description.txt b/metadata/hi-IN/short_description.txt similarity index 100% rename from metadata/hi/short_description.txt rename to metadata/hi-IN/short_description.txt diff --git a/metadata/hu/short_description.txt b/metadata/hu-HU/short_description.txt similarity index 100% rename from metadata/hu/short_description.txt rename to metadata/hu-HU/short_description.txt diff --git a/metadata/it/short_description.txt b/metadata/it-IT/short_description.txt similarity index 100% rename from metadata/it/short_description.txt rename to metadata/it-IT/short_description.txt diff --git a/metadata/ja/short_description.txt b/metadata/ja-JP/short_description.txt similarity index 100% rename from metadata/ja/short_description.txt rename to metadata/ja-JP/short_description.txt diff --git a/metadata/ko/short_description.txt b/metadata/ko-KR/short_description.txt similarity index 100% rename from metadata/ko/short_description.txt rename to metadata/ko-KR/short_description.txt diff --git a/metadata/nl/short_description.txt b/metadata/nl-NL/short_description.txt similarity index 100% rename from metadata/nl/short_description.txt rename to metadata/nl-NL/short_description.txt diff --git a/metadata/no/short_description.txt b/metadata/no-NO/short_description.txt similarity index 100% rename from metadata/no/short_description.txt rename to metadata/no-NO/short_description.txt diff --git a/metadata/pl/short_description.txt b/metadata/pl-PL/short_description.txt similarity index 100% rename from metadata/pl/short_description.txt rename to metadata/pl-PL/short_description.txt diff --git a/metadata/ru/short_description.txt b/metadata/ru-RU/short_description.txt similarity index 100% rename from metadata/ru/short_description.txt rename to metadata/ru-RU/short_description.txt diff --git a/metadata/ru/title.txt b/metadata/ru-RU/title.txt similarity index 100% rename from metadata/ru/title.txt rename to metadata/ru-RU/title.txt diff --git a/metadata/sv/short_description.txt b/metadata/sv-SE/short_description.txt similarity index 100% rename from metadata/sv/short_description.txt rename to metadata/sv-SE/short_description.txt diff --git a/metadata/tr/full_description.txt b/metadata/tr-TR/full_description.txt similarity index 100% rename from metadata/tr/full_description.txt rename to metadata/tr-TR/full_description.txt diff --git a/tools/check-fastlane-whitespace.py b/tools/check-fastlane-whitespace.py index 2a1865af..b582d02a 100755 --- a/tools/check-fastlane-whitespace.py +++ b/tools/check-fastlane-whitespace.py @@ -3,7 +3,9 @@ import glob import os -for f in glob.glob('metadata/*/*.txt') + glob.glob('metadata/*/*/*.txt'): +os.chdir(os.path.join(os.path.dirname(__file__), '..')) + +for f in glob.glob('metadata/*/*.txt') + glob.glob('metadata/*/*/*.txt'): if os.path.getsize(f) == 0: os.remove(f) continue

1 0

[orbot/master] Make text inputs in Orbot declare that they do want to opt
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit a32452e7775c28298db7bb3632da5f1e554cabed Author: lexi <dsnake(a)protonmail.com> Date: Mon Mar 25 22:49:29 2019 -0400 Make text inputs in Orbot declare that they do want to opt out of IME personalized learning. Of course, IMEs may ignore this request, but it's a nudge in the direction of Tor's general philosophy on user privacy, particularly with regards to minimizing the footprint that a Tor app leaves on the user's device. --- .../android/settings/SettingsPreferences.java | 37 ++++++++++++++-------- .../android/ui/NoPersonalizedLearningEditText.java | 13 ++++++++ .../ui/hiddenservices/dialogs/AddCookieDialog.java | 4 +-- .../ui/hiddenservices/dialogs/HSDataDialog.java | 4 +-- .../res/layout/layout_add_client_cookie_dialog.xml | 4 +-- app/src/main/res/layout/layout_hs_backups_list.xml | 1 - app/src/main/res/layout/layout_hs_data_dialog.xml | 8 ++--- app/src/main/res/layout/layout_settings.xml | 29 ----------------- 8 files changed, 47 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java index c3b5189d..040b7b57 100644 --- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java +++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java @@ -6,25 +6,26 @@ package org.torproject.android.settings; import android.content.Context; import android.content.Intent; import android.os.Bundle; +import android.preference.EditTextPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceActivity; +import android.preference.PreferenceCategory; +import android.preference.PreferenceScreen; +import android.view.inputmethod.EditorInfo; +import android.widget.EditText; import org.torproject.android.R; -import org.torproject.android.service.util.Prefs; - - -public class SettingsPreferences - extends PreferenceActivity { - private static final String TAG = "SettingsPreferences"; +public class SettingsPreferences extends PreferenceActivity { private ListPreference prefLocale = null; protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); addPreferencesFromResource(R.xml.preferences); + setNoPersonalizedLearningOnEditTextPreferences(); getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS); prefLocale = (ListPreference) findPreference("pref_default_locale"); @@ -33,11 +34,9 @@ public class SettingsPreferences prefLocale.setEntries(languages.getAllNames()); prefLocale.setEntryValues(languages.getSupportedLocales()); prefLocale.setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - @Override public boolean onPreferenceChange(Preference preference, Object newValue) { String language = (String) newValue; - Intent intentResult = new Intent(); intentResult.putExtra("locale", language); setResult(RESULT_OK, intentResult); @@ -52,11 +51,23 @@ public class SettingsPreferences super.attachBaseContext(LocaleHelper.onAttach(base)); } - @Override - protected void onPause() { - //Language.setFromPreference(this, "pref_default_locale", true); - - super.onPause(); + private void setNoPersonalizedLearningOnEditTextPreferences() { + PreferenceScreen preferenceScreen = getPreferenceScreen(); + int categoryCount = preferenceScreen.getPreferenceCount(); + for (int i = 0; i < categoryCount; i++) { + Preference p = preferenceScreen.getPreference(i); + if (p instanceof PreferenceCategory) { + PreferenceCategory pc = (PreferenceCategory) p; + int preferenceCount = pc.getPreferenceCount(); + for (int j = 0; j < preferenceCount; j++) { + p = pc.getPreference(j); + if (p instanceof EditTextPreference) { + EditText editText = ((EditTextPreference) p).getEditText(); + editText.setImeOptions(editText.getImeOptions() | EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING); + } + } + } + } } } diff --git a/app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java b/app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java new file mode 100644 index 00000000..15d8d023 --- /dev/null +++ b/app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java @@ -0,0 +1,13 @@ +package org.torproject.android.ui; + +import android.content.Context; +import android.support.v7.widget.AppCompatEditText; +import android.util.AttributeSet; +import android.view.inputmethod.EditorInfo; + +public class NoPersonalizedLearningEditText extends AppCompatEditText { + public NoPersonalizedLearningEditText(Context context, AttributeSet attrs) { + super(context, attrs); + setImeOptions(getImeOptions() | EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING); + } +} diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java index 75663648..8441d53f 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java @@ -29,7 +29,7 @@ public class AddCookieDialog extends DialogFragment { .setTitle(R.string.client_cookies) .create(); - Button save = (Button) dialog_view.findViewById(R.id.cookie_dialog_save); + Button save = dialog_view.findViewById(R.id.cookie_dialog_save); save.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { String onion = ((EditText) dialog_view.findViewById(R.id.cookie_onion)).getText().toString(); @@ -45,7 +45,7 @@ public class AddCookieDialog extends DialogFragment { } }); - Button cancel = (Button) dialog_view.findViewById(R.id.cookie_dialog_cancel); + Button cancel = dialog_view.findViewById(R.id.cookie_dialog_cancel); cancel.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { addCookieDialog.cancel(); diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java index 98255604..01e09dff 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java @@ -32,7 +32,7 @@ public class HSDataDialog extends DialogFragment { .create(); // Buttons action - Button save = (Button) dialog_view.findViewById(R.id.HSDialogSave); + Button save = dialog_view.findViewById(R.id.HSDialogSave); save.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { String serverName = ((EditText) dialog_view.findViewById(R.id.hsName)).getText().toString(); @@ -55,7 +55,7 @@ public class HSDataDialog extends DialogFragment { } }); - Button cancel = (Button) dialog_view.findViewById(R.id.HSDialogCancel); + Button cancel = dialog_view.findViewById(R.id.HSDialogCancel); cancel.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { serviceDataDialog.cancel(); diff --git a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml b/app/src/main/res/layout/layout_add_client_cookie_dialog.xml index 4669a921..4561228e 100644 --- a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml +++ b/app/src/main/res/layout/layout_add_client_cookie_dialog.xml @@ -16,7 +16,7 @@ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" android:paddingLeft="5dp" /> - <EditText + <org.torproject.android.ui.NoPersonalizedLearningEditText android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="text" @@ -31,7 +31,7 @@ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" android:paddingLeft="5dp" /> - <EditText + <org.torproject.android.ui.NoPersonalizedLearningEditText android:layout_width="match_parent" android:layout_height="wrap_content" android:ems="10" diff --git a/app/src/main/res/layout/layout_hs_backups_list.xml b/app/src/main/res/layout/layout_hs_backups_list.xml index 521f381d..154195f5 100644 --- a/app/src/main/res/layout/layout_hs_backups_list.xml +++ b/app/src/main/res/layout/layout_hs_backups_list.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/app/src/main/res/layout/layout_hs_data_dialog.xml b/app/src/main/res/layout/layout_hs_data_dialog.xml index 524d69a8..8820a8d0 100644 --- a/app/src/main/res/layout/layout_hs_data_dialog.xml +++ b/app/src/main/res/layout/layout_hs_data_dialog.xml @@ -16,7 +16,7 @@ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" android:paddingLeft="5dp" /> - <EditText + <org.android.ui.NoPersonalizedLearningEditText android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="text" @@ -31,7 +31,7 @@ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" android:paddingLeft="5dp" /> - <EditText + <org.android.ui.NoPersonalizedLearningEditText android:layout_width="match_parent" android:layout_height="wrap_content" android:ems="10" @@ -46,7 +46,7 @@ android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small" android:paddingLeft="5dp" /> - <EditText + <org.android.ui.NoPersonalizedLearningEditText android:layout_width="match_parent" android:layout_height="wrap_content" android:ems="10" @@ -84,4 +84,4 @@ </LinearLayout> -</LinearLayout> \ No newline at end of file +</LinearLayout> diff --git a/app/src/main/res/layout/layout_settings.xml b/app/src/main/res/layout/layout_settings.xml deleted file mode 100644 index f9b69711..00000000 --- a/app/src/main/res/layout/layout_settings.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - - <ScrollView android:layout_height="380px" - android:layout_width="fill_parent"> - - <EditText android:id="@+id/textSettings" - android:layout_height="fill_parent" - android:layout_width="fill_parent" - android:layout_weight="1.0" - android:singleLine="false" - android:textSize="11px" - /> - - </ScrollView> - - <Button android:id="@+id/btnSettingsSave" - android:layout_width="fill_parent" - android:layout_height="40px" - android:text="@string/btn_save_settings" - android:layout_margin="0sp" - - - /> -</LinearLayout>

1 0

[orbot/master] setup Fastlane to upload to Google Play
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit baced1800d7a9b26130da21e1e0d1fa8af4841d3 Author: Hans-Christoph Steiner <hans(a)eds.org> Date: Fri May 10 15:38:23 2019 +0200 setup Fastlane to upload to Google Play --- .gitignore | 7 +++++++ fastlane/Appfile | 1 + fastlane/Fastfile | 27 +++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/.gitignore b/.gitignore index 8b28d8af..a8f09edc 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,10 @@ orbotservice/src/main/libs/ orbotservice/src/main/jniLibs/ orbotservice/src/main/assets/armeabi/ orbotservice/src/main/assets/x86/ + +# emacs +*~ + +# Fastlane +/fastlane/report.xml +/fastlane/README.md diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 00000000..ae4446a5 --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1 @@ +package_name("org.torproject.android") diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 00000000..9dc185db --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,27 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# +# set SUPPLY_JSON_KEY_DATA before running, or do `. ~/.fastlane/bashrc` + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:android) + +platform :android do + desc "Upload the app store metadata" + lane :metadata do + supply( + skip_upload_apk: true, + skip_upload_aab: true, + ) + end +end

1 0

[orbot/master] Fixes #211: Resource Not Found on Command Line Build
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit ae4ce1c90550f894db1e411ad6e18a2d0c22817a Author: sisbell <shane.isbell(a)gmail.com> Date: Sun May 12 14:51:59 2019 -0700 Fixes #211: Resource Not Found on Command Line Build --- orbotservice/src/main/res/{values-cs => values}/colors.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/orbotservice/src/main/res/values-cs/colors.xml b/orbotservice/src/main/res/values/colors.xml similarity index 100% rename from orbotservice/src/main/res/values-cs/colors.xml rename to orbotservice/src/main/res/values/colors.xml

1 0

[orbot/master] Removed Obsolete @TaretApi Annotations for API Levels that
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit d2feefdddb69d6ea4285d1d6b12e44d7b845e06c Author: lexi <dsnake(a)protonmail.com> Date: Wed May 8 12:24:57 2019 -0400 Removed Obsolete @TaretApi Annotations for API Levels that are lower than Orbot's minimum, API Level 16 --- app/src/main/java/org/torproject/android/OrbotApp.java | 14 ++------------ .../java/org/torproject/android/settings/Languages.java | 1 - .../java/org/torproject/android/vpn/VPNEnableActivity.java | 10 +--------- .../java/org/torproject/android/service/TorService.java | 6 ------ .../torproject/android/service/vpn/OrbotVpnManager.java | 1 - .../org/torproject/android/service/vpn/TorVpnService.java | 14 +++----------- .../java/org/torproject/android/service/vpn/Tun2Socks.java | 3 --- 7 files changed, 6 insertions(+), 43 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java index 7279c8e2..0aeb59ed 100644 --- a/app/src/main/java/org/torproject/android/OrbotApp.java +++ b/app/src/main/java/org/torproject/android/OrbotApp.java @@ -2,7 +2,6 @@ package org.torproject.android; import android.annotation.SuppressLint; -import android.annotation.TargetApi; import android.app.Activity; import android.app.Application; import android.app.Notification; @@ -12,30 +11,22 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Configuration; -import android.net.VpnService; -import android.os.Build; import android.support.v4.app.NotificationCompat; -import android.util.Log; -import android.widget.RemoteViews; import com.github.javiersantos.appupdater.AppUpdater; import com.github.javiersantos.appupdater.enums.Display; import com.github.javiersantos.appupdater.enums.UpdateFrom; import org.torproject.android.service.OrbotConstants; -import org.torproject.android.service.TorEventHandler; -import org.torproject.android.service.TorService; import org.torproject.android.service.util.Prefs; import org.torproject.android.settings.Languages; import org.torproject.android.settings.LocaleHelper; import java.util.Locale; -import java.util.Set; -public class OrbotApp extends Application implements OrbotConstants -{ +public class OrbotApp extends Application implements OrbotConstants { private Locale locale; @@ -118,6 +109,5 @@ public class OrbotApp extends Application implements OrbotConstants Notification notification = notifyBuilder.build(); notificationManager.notify(notifyId, notification); - } - + } } diff --git a/app/src/main/java/org/torproject/android/settings/Languages.java b/app/src/main/java/org/torproject/android/settings/Languages.java index b7425996..58566f12 100644 --- a/app/src/main/java/org/torproject/android/settings/Languages.java +++ b/app/src/main/java/org/torproject/android/settings/Languages.java @@ -139,7 +139,6 @@ public class Languages { return singleton; } - //(a)TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) @SuppressLint("NewApi") public static void setLanguage(final ContextWrapper contextWrapper, String language, boolean refresh) { if (locale != null && TextUtils.equals(locale.getLanguage(), language) && (!refresh)) { diff --git a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java index 551f2e62..e883913f 100644 --- a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java +++ b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java @@ -1,15 +1,9 @@ package org.torproject.android.vpn; -import org.torproject.android.R; import org.torproject.android.service.util.Prefs; import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; -import android.annotation.TargetApi; -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; import android.content.Intent; import android.net.VpnService; import android.os.Build; @@ -19,11 +13,9 @@ import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.Window; -/* +/** * To combat background service being stopped/swiped */ - -@TargetApi(14) public class VPNEnableActivity extends AppCompatActivity { private final static int REQUEST_VPN = 7777; 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 7f2b37cc..66889b5f 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -9,8 +9,6 @@ package org.torproject.android.service; import android.annotation.SuppressLint; -import android.annotation.TargetApi; -import android.app.Application; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationManager; @@ -40,9 +38,7 @@ import android.text.TextUtils; import android.util.Log; import com.jaredrummler.android.shell.CommandResult; -import com.jaredrummler.android.shell.Shell; -import org.torproject.android.binary.TorResourceInstaller; import org.torproject.android.control.ConfigEntry; import org.torproject.android.control.TorControlConnection; import org.torproject.android.service.util.CustomShell; @@ -61,7 +57,6 @@ import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; @@ -1911,7 +1906,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } - @TargetApi(14) public void clearVpnProxy () { debug ("clearing VPN Proxy"); 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 5ca4505c..90a13336 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 @@ -52,7 +52,6 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.concurrent.TimeoutException; -(a)TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) public class OrbotVpnManager implements Handler.Callback { private static final String TAG = "OrbotVpnService"; diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java index 7d18ffd8..34d89b49 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java @@ -1,36 +1,28 @@ package org.torproject.android.service.vpn; -import android.annotation.TargetApi; import android.app.Service; import android.content.Intent; import android.net.VpnService; -import android.os.Build; /** * Created by n8fr8 on 9/26/16. */ -(a)TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) public class TorVpnService extends VpnService { - - OrbotVpnManager mVpnManager; - @Override public void onCreate() { super.onCreate(); - mVpnManager = new OrbotVpnManager(this); } /* (non-Javadoc) - * @see android.app.Service#onStart(android.content.Intent, int) - */ + * @see android.app.Service#onStart(android.content.Intent, int) + */ public int onStartCommand(Intent intent, int flags, int startId) { - mVpnManager.handleIntent(new Builder(),intent); + mVpnManager.handleIntent(new Builder(), intent); return Service.START_STICKY; } - } diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java index ff1ac949..958fb9ad 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/Tun2Socks.java @@ -19,15 +19,12 @@ package org.torproject.android.service.vpn; * */ -import android.annotation.TargetApi; -import android.os.Build; import android.os.ParcelFileDescriptor; import android.util.Log; import java.net.DatagramSocket; import java.net.Socket; -(a)TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) public class Tun2Socks {

1 0