- tor-commits - lists.torproject.org

[orbot/master] Fixup 93bf7b24
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit dbaf06be4533e301b0c91d553ec4203e23c2e057 Author: Tad <tad(a)spotco.us> Date: Mon Jul 12 15:58:07 2021 -0400 Fixup 93bf7b24 --- .../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 ac68020a..9ebc869d 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 @@ -363,7 +363,7 @@ public class OrbotVpnManager implements Handler.Callback { private void startDNS(String pdnsPath, String torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort) throws IOException, TimeoutException { String debugEnabledCmd = ""; String debugEnabledConf = "off"; - if (prefs.getBoolean(PREF_ENABLE_LOGGING, false)) { + if (Prefs.useDebugLogging()) { debugEnabledCmd = "-g"; debugEnabledConf = "on"; }

1 0

[orbot/master] Merge pull request #495 from SkewedZeppelin/fixup
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit df0cfc8096f6bc11a30fbff5b448d3c7fadca002 Merge: cb9bd46e dbaf06be Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Jul 13 11:27:53 2021 -0400 Merge pull request #495 from SkewedZeppelin/fixup Fixup 93bf7b24 .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

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

22 Dec '21

commit 283b281c2145cd11ecf3e5c3cbd8a413c25e49dc Merge: df0cfc80 443f383a Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Jul 13 11:29:03 2021 -0400 Merge pull request #493 from weblate/weblate-guardianproject-orbot Translations update from Weblate app/src/main/res/values-si-rLK/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

1 0

[orbot/master] add UI feedback when Snowflake Proxy mode is enabled
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 055900d9d27d1f3d933a40dd26ad1d88f594b758 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jul 13 12:11:50 2021 -0400 add UI feedback when Snowflake Proxy mode is enabled --- app/build.gradle | 4 +++- .../org/torproject/android/OrbotMainActivity.java | 16 +++++++++++++++- app/src/main/res/layout/layout_main.xml | 22 +++++++++++++++++++--- app/src/main/res/values/strings.xml | 1 + 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9b8997bd..1d365f24 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -127,7 +127,7 @@ repositories { dependencies { implementation project(':orbotservice') - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' implementation 'pl.bclogic:pulsator4droid:1.0.3' implementation 'com.github.apl-devs:appintro:v4.2.2' implementation project(path: ':appcore') @@ -136,6 +136,8 @@ dependencies { implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'com.android.volley:volley:1.2.0' implementation 'com.github.tladesignz:IPtProxy:1.0.0' + + implementation 'com.github.jetradarmobile:android-snowfall:1.2.1' } // Map for the version code that gives each ABI a value. diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 4f0143d3..df899d70 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -51,6 +51,8 @@ import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import com.jetradarmobile.snowfall.SnowfallView; + import org.torproject.android.core.Languages; import org.torproject.android.core.LocaleHelper; import org.torproject.android.core.ui.Rotate3dAnimation; @@ -283,6 +285,10 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan sendIntentToService(ACTION_STOP); + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.GONE); + sv.stopFalling(); + } private void doLayout() { @@ -945,12 +951,20 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan if (Prefs.beSnowflakeProxy()) { lblStatus.setText(getString(R.string.status_activated)+"\n" - + "❄❄You are a snowflake❄❄"); + + getString(R.string.snowflake_proxy_enabled)); + + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.VISIBLE); + sv.restartFalling(); } else { lblStatus.setText(getString(R.string.status_activated)); + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.GONE); + sv.stopFalling(); + } diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml index e8eba5eb..5cba751e 100644 --- a/app/src/main/res/layout/layout_main.xml +++ b/app/src/main/res/layout/layout_main.xml @@ -15,19 +15,33 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" /> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.jetradarmobile.snowfall.SnowfallView + android:id="@+id/snowflake_view" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + <androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent"> <ScrollView - android:layout_width="wrap_content" - android:layout_height="wrap_content"> + + android:layout_width="match_parent" + android:layout_height="match_parent" + > <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content"> + <FrameLayout android:id="@+id/frameMain" android:layout_width="match_parent" @@ -274,11 +288,13 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="horizontal" + android:minHeight="200dp" android:padding="3dp" /> </LinearLayout> </RelativeLayout> + </ScrollView> @@ -308,7 +324,7 @@ </LinearLayout> </androidx.drawerlayout.widget.DrawerLayout> - + </FrameLayout> </LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 94cfc800..e4ccff7d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -268,6 +268,7 @@ <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> + <string name="snowflake_proxy_enabled">SNOWFLAKE PROXY MODE ENABLED</string> </resources>

1 0

[orbot/master] enable snowflake mode for orbotTV
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 7023cd27e8aaffa3ac36f989ce9bd3b79e1aca50 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jul 13 12:28:01 2021 -0400 enable snowflake mode for orbotTV --- app-tv/build.gradle | 3 ++ .../torproject/android/tv/TeeveeMainActivity.java | 50 ++++++++++++++++++++++ app-tv/src/main/res/layout/layout_main.xml | 27 +++++++++++- app-tv/src/main/res/values/strings.xml | 1 + 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/app-tv/build.gradle b/app-tv/build.gradle index b7121d8b..6d3250b5 100644 --- a/app-tv/build.gradle +++ b/app-tv/build.gradle @@ -137,6 +137,9 @@ dependencies { // leanback-tab is an add-on that provides customized TabLayout to be used as the top navigation bar. implementation "androidx.leanback:leanback-tab:1.1.0-beta01" + //add snowflake fun + implementation 'com.github.jetradarmobile:android-snowfall:1.2.1' + } // Map for the version code that gives each ABI a value. 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 0c0b2d5c..ef76c824 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 @@ -48,6 +48,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; +import com.jetradarmobile.snowfall.SnowfallView; import net.freehaven.tor.control.TorControlCommands; import org.json.JSONArray; @@ -98,6 +99,7 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo private TextView uploadText = null; private TextView mTxtOrbotLog = null; private Switch mBtnVPN = null; + private Switch mBtnSnowflake = null; /* Some tracking bits */ private String torStatus = null; //latest status reported from the tor service private Intent lastStatusIntent; // the last ACTION_STATUS Intent received @@ -326,6 +328,9 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo Intent intent = new Intent(TeeveeMainActivity.this, OrbotService.class); stopService(intent); + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.GONE); + sv.stopFalling(); } private void doLayout() { @@ -379,6 +384,33 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo } }); + mBtnSnowflake = findViewById(R.id.btnSnowflake); + mBtnSnowflake.setFocusable(true); + mBtnSnowflake.setFocusableInTouchMode(true); + + mBtnSnowflake.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 beASnowflake = Prefs.beSnowflakeProxy(); + mBtnSnowflake.setChecked(beASnowflake); + + mBtnSnowflake.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + Prefs.setBeSnowflakeProxy(isChecked); + } + }); rv = findViewById(R.id.rv); LinearLayoutManager llm = new LinearLayoutManager(this); @@ -791,6 +823,24 @@ public class TeeveeMainActivity extends Activity implements OrbotConstants, OnLo Log.d(TAG, "autoStartFromIntent finish"); } + if (Prefs.beSnowflakeProxy()) + { + + + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.VISIBLE); + sv.restartFalling(); + + } + else + { + SnowfallView sv = findViewById(R.id.snowflake_view); + sv.setVisibility(View.GONE); + sv.stopFalling(); + + + } + } else if (torStatus == TorServiceConstants.STATUS_STARTING) { diff --git a/app-tv/src/main/res/layout/layout_main.xml b/app-tv/src/main/res/layout/layout_main.xml index a6bdd5f2..e4e07441 100644 --- a/app-tv/src/main/res/layout/layout_main.xml +++ b/app-tv/src/main/res/layout/layout_main.xml @@ -5,12 +5,23 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/light_gray" + android:background="@color/light_purple" xmlns:app="http://schemas.android.com/apk/res-auto"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.jetradarmobile.snowfall.SnowfallView + android:id="@+id/snowflake_view" + android:visibility="gone" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + <RelativeLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + > <androidx.recyclerview.widget.RecyclerView @@ -18,6 +29,8 @@ android:layout_height="wrap_content" android:id="@+id/rv" android:layout_marginBottom="60dp" + + /> @@ -90,7 +103,16 @@ android:lines="1" /> + <Switch + android:id="@+id/btnSnowflake" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/snowflake_mode" + android:layout_margin="9dp" + android:layout_gravity="center" + app:switchPadding="3dp" + /> </LinearLayout> @@ -130,6 +152,7 @@ android:fontFamily="monospace" /> </LinearLayout> + </FrameLayout> </LinearLayout> diff --git a/app-tv/src/main/res/values/strings.xml b/app-tv/src/main/res/values/strings.xml index 36d5041a..f4b1ffdb 100644 --- a/app-tv/src/main/res/values/strings.xml +++ b/app-tv/src/main/res/values/strings.xml @@ -244,4 +244,5 @@ <string name="wifi_only">Wifi only</string> <string name="keep_your_apps_from_using_mobile_data">Only allow connection over wifi (coming soon!)</string> <string name="remove">Remove</string> + <string name="snowflake_mode">Snowflake</string> </resources>

1 0

[orbot/master] Merge pull request #490 from syphyr/main
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 9717385a949251765a707aae2a1411f778eaf18b Merge: ecd12b0b 7c6f924f Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Jul 12 10:54:58 2021 -0400 Merge pull request #490 from syphyr/main Create only one pdnsd config file .../main/java/org/torproject/android/service/vpn/OrbotVpnManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] Merge pull request #491 from SkewedZeppelin/nodebugpdnsd
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit cb9bd46ec36ebb515abaf0bcdaf0ea4a16c44d9c Merge: 9717385a 93bf7b24 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Jul 12 10:55:25 2021 -0400 Merge pull request #491 from SkewedZeppelin/nodebugpdnsd Only enable pdnsd debug output when debug logging is enabled .../torproject/android/service/vpn/OrbotVpnManager.java | 17 ++++++++++++----- orbotservice/src/main/res/values/pdnsd.xml | 1 + 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

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

22 Dec '21

commit bca48cc947e4798c8f932cd28523c61e4cae67d9 Merge: 7e223f02 df0cfc80 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jul 13 11:27:59 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot .../android/service/vpn/OrbotVpnManager.java | 19 +++++++++++++------ orbotservice/src/main/res/values/pdnsd.xml | 1 + 2 files changed, 14 insertions(+), 6 deletions(-)

1 0

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

22 Dec '21

commit 5b33510d0ae9f6948b152c36a7223d43b09196b5 Merge: bca48cc9 283b281c Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jul 13 11:29:08 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/res/values-si-rLK/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

1 0

[orbot/master] update android dependencies
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2e72338859c57824e7150491eca286052b898800 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jul 13 13:23:14 2021 -0400 update android dependencies --- app-tv/build.gradle | 4 ++-- orbotservice/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-tv/build.gradle b/app-tv/build.gradle index 63ca88ef..ef03eb5f 100644 --- a/app-tv/build.gradle +++ b/app-tv/build.gradle @@ -118,9 +118,9 @@ dependencies { implementation 'androidx.palette:palette:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation project(path: ':appcore') - implementation 'androidx.recyclerview:recyclerview:1.2.0' + implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' implementation project(path: ':intentintegrator') androidTestImplementation "tools.fastlane:screengrab:1.2.0" diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 022cb8b6..5fb08e3a 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation 'com.jaredrummler:android-shell:1.0.0' - implementation 'androidx.core:core:1.5.0' + implementation 'androidx.core:core:1.6.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' testImplementation 'junit:junit:4.13.2'

1 0