- tor-commits - lists.torproject.org

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot into syphyr-main
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 9a03f1203f63c50ee6a550511f830e32cba3b038 Merge: 602d2115 a749fe0d Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 9 11:21:59 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot into syphyr-main app/src/main/res/values-fr-rFR/strings.xml | 4 +- app/src/main/res/values-it/strings.xml | 6 +-- app/src/main/res/values-iw/strings.xml | 5 ++- app/src/main/res/values-pt-rBR/strings.xml | 2 + app/src/main/res/values-ro-rRO/strings.xml | 44 ++++++++++++++++++---- app/src/main/res/values-tr/strings.xml | 2 + app/src/main/res/values-uk/strings.xml | 2 + app/src/main/res/values-vi/strings.xml | 2 + app/src/main/res/values-zh-rCN/strings.xml | 4 +- fastlane/metadata/android/zh-CN/title.txt | 2 +- .../torproject/android/service/OrbotService.java | 2 +- orbotservice/src/main/res/raw/bridges.txt | 1 - 12 files changed, 58 insertions(+), 18 deletions(-)

1 0

[orbot/master] Merge pull request #486 from weblate/weblate-guardianproject-orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit a749fe0d641d501a98b343968a100b73d7540a6b Merge: 8472e0dd 570f7133 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jul 9 11:11:55 2021 -0400 Merge pull request #486 from weblate/weblate-guardianproject-orbot Translations update from Weblate app/src/main/res/values-fr-rFR/strings.xml | 4 ++- app/src/main/res/values-it/strings.xml | 6 ++-- app/src/main/res/values-iw/strings.xml | 5 ++-- app/src/main/res/values-pt-rBR/strings.xml | 2 ++ app/src/main/res/values-ro-rRO/strings.xml | 44 ++++++++++++++++++++++++------ app/src/main/res/values-tr/strings.xml | 2 ++ app/src/main/res/values-uk/strings.xml | 2 ++ app/src/main/res/values-vi/strings.xml | 2 ++ app/src/main/res/values-zh-rCN/strings.xml | 4 ++- fastlane/metadata/android/zh-CN/title.txt | 2 +- 10 files changed, 57 insertions(+), 16 deletions(-)

1 0

[orbot/master] Create only one pdnsd config file
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 7c6f924fbe11b08590c65918ef6b3a42dabd38de Author: syphyr <syphyr(a)gmail.com> Date: Wed Jul 7 01:14:41 2021 +0200 Create only one pdnsd config file A new pdnsd config file is created each time the vpn is started. This creates a lot of unnecessary config files. Lets just update the latest config file and overwrite the previous one. --- .../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 7e991ace..64994d20 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 @@ -92,7 +92,7 @@ public class OrbotVpnManager implements Handler.Callback { Log.d(TAG, "pdsnd conf:" + conf); - File fPid = new File(fileDir, pdnsdPort + "pdnsd.conf"); + File fPid = new File(fileDir, "pdnsd.conf"); if (fPid.exists()) { fPid.delete();

1 0

[orbot/master] fix orbot-tv app highlighting
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit fdb16f27d100afc5c2d5433fcf223e1f50fde8fc Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 9 11:39:09 2021 -0400 fix orbot-tv app highlighting --- .../torproject/android/tv/TeeveeMainActivity.java | 59 ++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java b/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java index adea460d..0c0b2d5c 100644 --- a/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java +++ b/app-tv/src/main/java/org/torproject/android/tv/TeeveeMainActivity.java @@ -16,6 +16,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.Bitmap; import android.graphics.Canvas; +import android.graphics.PorterDuff; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.net.Uri; @@ -346,6 +347,23 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo mBtnVPN = findViewById(R.id.btnVPN); + mBtnVPN.setFocusable(true); + mBtnVPN.setFocusableInTouchMode(true); + + mBtnVPN.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if (hasFocus) + v.setBackgroundColor(getColor(R.color.dark_purple)); + else + { + v.setBackgroundColor(getColor(R.color.med_gray)); + } + } + }); + + boolean useVPN = Prefs.useVpn(); mBtnVPN.setChecked(useVPN); @@ -366,6 +384,10 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo LinearLayoutManager llm = new LinearLayoutManager(this); llm.setOrientation(LinearLayoutManager.VERTICAL); rv.setLayoutManager(llm); + rv.setFocusable(true); + rv.setFocusableInTouchMode(true); + + } @Override @@ -908,6 +930,9 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo View v = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.layout_apps_listing, viewGroup, false); final AppViewHolder avh = new AppViewHolder(v); + v.setFocusable(true); + v.setFocusableInTouchMode(true); + return avh; } @@ -947,6 +972,28 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo } }); + + avh.parent.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if (hasFocus) + v.setBackgroundColor(getColor(R.color.dark_purple)); + else + { + Palette.generateAsync(drawableToBitmap(app.getIcon()), new Palette.PaletteAsyncListener() { + public void onGenerated(Palette palette) { + // Do something with colors... + + int color = palette.getVibrantColor(0x000000); + avh.parent.setBackgroundColor(color); + + } + }); + } + } + }); + } catch (NameNotFoundException e) { e.printStackTrace(); } @@ -961,6 +1008,18 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo } }); + avh.parent.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if (hasFocus) + v.setBackgroundColor(getColor(R.color.dark_purple)); + else + { + v.setBackgroundColor(getColor(R.color.med_gray)); + } + } + }); } }

1 0

[orbot/master] enable focus highlighting for non touch screens
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 1113f18c2f0bc274a60c122c3f824a52c10194a7 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 9 11:39:54 2021 -0400 enable focus highlighting for non touch screens --- .../org/torproject/android/ui/AppManagerActivity.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 9ad0a09f..6cb0e032 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -174,6 +174,22 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList } } + convertView.setFocusable(true); + convertView.setFocusableInTouchMode(true); + + convertView.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if (hasFocus) + v.setBackgroundColor(getResources().getColor(R.color.dark_purple)); + else + { + v.setBackgroundColor(getResources().getColor(android.R.color.transparent)); + } + } + }); + return convertView; } };

1 0

[orbot/master] have to build pdnsd as an executable, then rename it to libpdnsd.so
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 6afd54bf1dccbd0e81aff9c93848859474d9ee8a Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 9 16:20:32 2021 -0400 have to build pdnsd as an executable, then rename it to libpdnsd.so --- orbotservice/src/main/jni/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orbotservice/src/main/jni/Android.mk b/orbotservice/src/main/jni/Android.mk index 3d32a41b..123954ff 100644 --- a/orbotservice/src/main/jni/Android.mk +++ b/orbotservice/src/main/jni/Android.mk @@ -29,8 +29,8 @@ LOCAL_MODULE := pdnsd LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%) LOCAL_CFLAGS := -Wall -O2 -I$(LOCAL_PATH)/pdnsd -DHAVE_STPCPY - -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_EXECUTABLE) +##include $(BUILD_SHARED_LIBRARY) ######################################################## ## libancillary

1 0

[orbot/master] update to version 1651100200
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2a0ffa6551423cce546d825b0519e2c8b25e924b Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 9 11:40:04 2021 -0400 update to version 1651100200 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a456a18e..d8f961cd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,7 +82,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1651100100 + versionCode 1651100200 versionName getVersionName() archivesBaseName = "Orbot-$versionName"

1 0

[orbot/master] don't abort on lint
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit fc6a0ea7d7f048e334e0fd2f0e89298027bcc79e Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Feb 24 10:54:40 2021 -0500 don't abort on lint --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 4d9e43a9..c9470670 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,7 +52,7 @@ android { } lintOptions { checkReleaseBuilds false - abortOnError true + abortOnError false htmlReport true xmlReport false

1 0

[orbot/master] move SDK back to 29 so that snowflake-go code can work
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit b35008f38e86c3edbc42623d746b9abd6f2257cb Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Apr 5 15:32:46 2021 -0400 move SDK back to 29 so that snowflake-go code can work --- app/build.gradle | 2 +- orbotservice/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c9470670..b0d45307 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,7 +80,7 @@ android { dimension "free" minSdkVersion 16 applicationId 'org.torproject.android' - targetSdkVersion 30 + targetSdkVersion 29 versionCode 1641200300 versionName getVersionName() diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index e881f448..58ea078d 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -13,7 +13,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 30 + targetSdkVersion 29 } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8

1 0

[orbot/master] for #441, enable queries keyword in manifest, to enable package lookup on Android 11
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit b6c63ea86f9a090b1bd1ff8d6f8dad4a45322e38 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Feb 23 15:27:28 2021 -0500 for #441, enable queries keyword in manifest, to enable package lookup on Android 11 --- app/src/main/AndroidManifest.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ae1a8be8..3bbaf610 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,6 +21,12 @@ android:maxSdkVersion="18" /> <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> + <queries> + <intent> + <action android:name="android.intent.action.MAIN" /> + </intent> + </queries> + <application android:name=".OrbotApp" android:allowBackup="false"

1 0