- tor-commits - lists.torproject.org

[orbot/master] IPtProxy 1.0.0
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit fe19638504bcee353f8f0221fd0fdb4d4aaddafb Author: bim <dsnake(a)protonmail.com> Date: Thu May 27 09:43:01 2021 -0400 IPtProxy 1.0.0 --- 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 18b18188..45c6b03b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -136,7 +136,7 @@ dependencies { androidTestImplementation "tools.fastlane:screengrab:1.2.0" implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' implementation 'com.android.volley:volley:1.2.0' - implementation 'com.github.tladesignz:IPtProxy:0.5.2' + implementation 'com.github.tladesignz:IPtProxy:1.0.0' } // Map for the version code that gives each ABI a value. diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 67770146..d680cd09 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -64,5 +64,5 @@ dependencies { api 'info.guardianproject:jtorctl:0.4.5.7' implementation 'info.guardianproject:tor-android:0.4.5.7' - implementation 'com.github.tladesignz:IPtProxy:0.6.0' + implementation 'com.github.tladesignz:IPtProxy:1.0.0' }

1 0

[orbot/master] add fingerprint to bridge config https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/issues/40045#note_2737108
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 08b79c4b8bbc8c444e15e93a842e6b1c8182a06e Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu May 27 10:44:59 2021 -0400 add fingerprint to bridge config https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… --- orbotservice/src/main/res/raw/bridges.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/res/raw/bridges.txt b/orbotservice/src/main/res/raw/bridges.txt index 8787099c..54377f1a 100644 --- a/orbotservice/src/main/res/raw/bridges.txt +++ b/orbotservice/src/main/res/raw/bridges.txt @@ -5,4 +5,4 @@ obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWOD obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0 obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com -snowflake 192.0.2.3:1 \ No newline at end of file +Bridge snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72

1 0

[orbot/master] comment no longer needed with IPtProxy sources being hosted
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit a348217ec0915e2b23405947c83b07b691167eb3 Author: bim <dsnake(a)protonmail.com> Date: Tue Jun 1 12:42:27 2021 -0400 comment no longer needed with IPtProxy sources being hosted --- .../java/org/torproject/android/service/OrbotService.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index ed28dbfa..099653ae 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -375,16 +375,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb This is to host a snowflake entrance node / bridge */ private void runSnowflakeProxy () { - - - // @param capacity Maximum concurrent clients. OPTIONAL. Defaults to 10, if 0. -// @param broker Broker URL. OPTIONAL. Defaults to https://snowflake-broker.bamsoftware.com/, if empty. -// @param relay WebSocket relay URL. OPTIONAL. Defaults to wss://snowflake.bamsoftware.com/, if empty. -// @param stun STUN URL. OPTIONAL. Defaults to stun:stun.stunprotocol.org:3478, if empty. -// @param logFile Name of log file. OPTIONAL -// @param keepLocalAddresses Keep local LAN address ICE candidates. -// @param unsafeLogging Prevent logs from being scrubbed. - int capacity = 3; String broker = "https://snowflake-broker.bamsoftware.com/"; String relay = "wss://snowflake.bamsoftware.com/"; @@ -396,7 +386,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } private void stopSnowflakeProxy () { - IPtProxy.stopSnowflakeProxy(); } /**

1 0

[orbot/master] removed obsolete method
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 56e0814147833c409a4efd49d6019c81a04b748c Author: bim <dsnake(a)protonmail.com> Date: Tue Jun 1 12:29:37 2021 -0400 removed obsolete method --- .../src/main/java/org/torproject/android/service/OrbotService.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 2bde66d2..ed28dbfa 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -155,11 +155,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return bridgeList.split("\\n"); } - private static boolean useIPtProxy() { - String bridgeList = Prefs.getBridgesList(); - return bridgeList.contains("obfs3") || bridgeList.contains("obfs4") || bridgeList.contains("meek"); - } - public void debug(String msg) { Log.d(OrbotConstants.TAG, msg);

1 0

[orbot/master] Merge branch 'bitmold-tor_event_bandwidth'
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 71545226e0ac38279307c9085bb2630b4358e3cc Merge: 5fc9f872 491e3572 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Jun 2 17:17:14 2021 -0400 Merge branch 'bitmold-tor_event_bandwidth' .../org/torproject/android/OrbotMainActivity.java | 44 ++++++++-------------- app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-fr-rFR/strings.xml | 2 - app/src/main/res/values-is/strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 2 - app/src/main/res/values-pt/strings.xml | 2 - 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 | 2 - app/src/main/res/values/strings.xml | 2 - appcore/build.gradle | 1 - .../torproject/android/service/OrbotService.java | 38 +++++++++---------- .../android/service/TorEventHandler.java | 35 +++-------------- orbotservice/src/main/res/values-de/strings.xml | 2 + .../src/main/res/values-fr-rFR/strings.xml | 2 + orbotservice/src/main/res/values-is/strings.xml | 3 ++ orbotservice/src/main/res/values-nb/strings.xml | 2 + .../src/main/res/values-pt-rBR/strings.xml | 2 + .../src/main/res/values-pt-rPT/strings.xml | 3 ++ orbotservice/src/main/res/values-pt/strings.xml | 2 + orbotservice/src/main/res/values-tr/strings.xml | 2 + orbotservice/src/main/res/values-uk/strings.xml | 2 + orbotservice/src/main/res/values-vi/strings.xml | 2 + .../src/main/res/values-zh-rCN/strings.xml | 2 + orbotservice/src/main/res/values/strings.xml | 5 +++ 28 files changed, 66 insertions(+), 105 deletions(-)

1 0

[orbot/master] bandwidth propagates correctly from TorEventHandler -> OrbotService -> OrbotMainActivity
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 491e3572e694f4add61ce43d8ff17eff3fe1d334 Author: bim <dsnake(a)protonmail.com> Date: Tue Jun 1 19:42:21 2021 -0400 bandwidth propagates correctly from TorEventHandler -> OrbotService -> OrbotMainActivity --- .../org/torproject/android/OrbotMainActivity.java | 28 +++++++++++----------- .../torproject/android/service/OrbotService.java | 10 ++++---- .../android/service/TorEventHandler.java | 12 +++------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 0090410e..6a351e5d 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -158,16 +158,16 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan break; } case TorServiceConstants.LOCAL_ACTION_BANDWIDTH: { - long upload = intent.getLongExtra("up", 0); - long download = intent.getLongExtra("down", 0); - long written = intent.getLongExtra("written", 0); - long read = intent.getLongExtra("read", 0); + long totalWritten = intent.getLongExtra("totalWritten", 0); + long totalRead = intent.getLongExtra("totalRead", 0); + long lastWritten = intent.getLongExtra("lastWritten", 0); + long lastRead = intent.getLongExtra("lastRead", 0); Message msg = mStatusUpdateHandler.obtainMessage(MESSAGE_TRAFFIC_COUNT); - msg.getData().putLong("download", download); - msg.getData().putLong("upload", upload); - msg.getData().putLong("readTotal", read); - msg.getData().putLong("writeTotal", written); + msg.getData().putLong("lastRead", lastRead); + msg.getData().putLong("lastWritten", lastWritten); + msg.getData().putLong("totalWritten", totalWritten); + msg.getData().putLong("totalRead", totalRead); msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS)); mStatusUpdateHandler.sendMessage(msg); @@ -1174,12 +1174,12 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan switch (msg.what) { case MESSAGE_TRAFFIC_COUNT: - long upload = data.getLong("upload"); - long download = data.getLong("download"); - long totalRead = data.getLong("readTotal"); - long totalWrite = data.getLong("writeTotal"); - oma.downloadText.setText(String.format("%s / %s", OrbotService.formatBandwidthCount(oma, download), oma.formatTotal(totalRead))); - oma.uploadText.setText(String.format("%s / %s", OrbotService.formatBandwidthCount(oma, upload), oma.formatTotal(totalWrite))); + long lastWritten = data.getLong("lastWritten"); + long lastRead = data.getLong("lastRead"); + long totalRead = data.getLong("totalRead"); + long totalWrite = data.getLong("totalWritten"); + oma.downloadText.setText(String.format("%s / %s", OrbotService.formatBandwidthCount(oma, lastRead), oma.formatTotal(totalRead))); + oma.uploadText.setText(String.format("%s / %s", OrbotService.formatBandwidthCount(oma, lastWritten), oma.formatTotal(totalWrite))); break; case MESSAGE_PORTS: diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 3b802aff..5781b564 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -986,13 +986,13 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } } - protected void sendCallbackBandwidth(long upload, long download, long written, long read) { + protected void sendCallbackBandwidth(long lastWritten, long lastRead, long totalWritten, long totalRead) { Intent intent = new Intent(LOCAL_ACTION_BANDWIDTH); - intent.putExtra("up", upload); - intent.putExtra("down", download); - intent.putExtra("written", written); - intent.putExtra("read", read); + intent.putExtra("totalWritten", totalWritten); + intent.putExtra("totalRead", totalRead); + intent.putExtra("lastWritten", lastWritten); + intent.putExtra("lastRead", lastRead); intent.putExtra(EXTRA_STATUS, mCurrentStatus); LocalBroadcastManager.getInstance(this).sendBroadcast(intent); diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java index 29af35f7..0b49b461 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -1,7 +1,6 @@ package org.torproject.android.service; import android.text.TextUtils; -import android.util.Log; import net.freehaven.tor.control.EventHandler; @@ -35,7 +34,6 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { @Override public void message(String severity, String msg) { - Log.d("bim", "message: " + msg); if (severity.equalsIgnoreCase("debug")) mService.debug(severity + ": " + msg); else @@ -90,18 +88,14 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { if (read > 0 || written > 0) iconId = R.drawable.ic_stat_tor_xfer; - String sb = OrbotService.formatBandwidthCount(mService, read) + - " \u2193" + - " / " + - OrbotService.formatBandwidthCount(mService, written) + - " \u2191"; - Log.d("bim", "bandWidthUsed " + read + ", " + written); + String sb = OrbotService.formatBandwidthCount(mService, read) + " \u2193" + " / " + + OrbotService.formatBandwidthCount(mService, written) + " \u2191"; mService.showToolbarNotification(sb, OrbotService.NOTIFY_ID, iconId); mTotalTrafficWritten += written; mTotalTrafficRead += read; - mService.sendCallbackBandwidth(lastWritten, lastRead, mTotalTrafficWritten, mTotalTrafficRead); + mService.sendCallbackBandwidth(written, read, mTotalTrafficWritten, mTotalTrafficRead); lastWritten = 0; lastRead = 0;

1 0

[orbot/master] consistent data transfer logic in service, makes units in notiifcation accurate
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2519bb35cb72d9c3c523d534dc32dc6add124b2b Author: bim <dsnake(a)protonmail.com> Date: Tue Jun 1 18:57:22 2021 -0400 consistent data transfer logic in service, makes units in notiifcation accurate --- .../org/torproject/android/OrbotMainActivity.java | 20 ++----------- app/src/main/res/values-de/strings.xml | 2 -- app/src/main/res/values-fr-rFR/strings.xml | 2 -- app/src/main/res/values-is/strings.xml | 2 -- app/src/main/res/values-nb/strings.xml | 2 -- app/src/main/res/values-pt-rBR/strings.xml | 2 -- app/src/main/res/values-pt-rPT/strings.xml | 2 -- app/src/main/res/values-pt/strings.xml | 2 -- 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 | 2 -- app/src/main/res/values/strings.xml | 2 -- .../torproject/android/service/OrbotService.java | 12 ++++++++ .../android/service/TorEventHandler.java | 33 +++++----------------- orbotservice/src/main/res/values-de/strings.xml | 2 ++ .../src/main/res/values-fr-rFR/strings.xml | 2 ++ orbotservice/src/main/res/values-is/strings.xml | 3 ++ orbotservice/src/main/res/values-nb/strings.xml | 2 ++ .../src/main/res/values-pt-rBR/strings.xml | 2 ++ .../src/main/res/values-pt-rPT/strings.xml | 3 ++ orbotservice/src/main/res/values-pt/strings.xml | 2 ++ orbotservice/src/main/res/values-tr/strings.xml | 2 ++ orbotservice/src/main/res/values-uk/strings.xml | 2 ++ orbotservice/src/main/res/values-vi/strings.xml | 2 ++ .../src/main/res/values-zh-rCN/strings.xml | 2 ++ orbotservice/src/main/res/values/strings.xml | 5 ++++ 27 files changed, 51 insertions(+), 67 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 4f6e6799..0090410e 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -339,7 +339,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan } private void resetBandwidthStatTextviews() { - String zero = String.format("%s / %s", formatCount(0), formatTotal(0)); + String zero = String.format("%s / %s", OrbotService.formatBandwidthCount(this, 0), formatTotal(0)); downloadText.setText(zero); uploadText.setText(zero); } @@ -1026,20 +1026,6 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan LocalBroadcastManager.getInstance(this).unregisterReceiver(mLocalBroadcastReceiver); } - private String formatCount(long count) { - NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault()); - // Converts the supplied argument into a string. - // Under 2 mebibytes, returns "xxx.xKiB/s" - // Over 2 mebibytes, returns "xxx.xxMiB/s" - if (count < 1e6) - return numberFormat.format(Math.round(((float) ((int) (count * 10 / 1024)) / 10))) - + getString(R.string.kibibyte_per_second); - else - return numberFormat.format(Math - .round(((float) ((int) (count * 100 / 1024 / 1024)) / 100))) - + getString(R.string.mebibyte_per_second); - } - private String formatTotal(long count) { NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault()); // Converts the supplied argument into a string. @@ -1192,8 +1178,8 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan long download = data.getLong("download"); long totalRead = data.getLong("readTotal"); long totalWrite = data.getLong("writeTotal"); - oma.downloadText.setText(String.format("%s / %s", oma.formatCount(download), oma.formatTotal(totalRead))); - oma.uploadText.setText(String.format("%s / %s", oma.formatCount(upload), oma.formatTotal(totalWrite))); + oma.downloadText.setText(String.format("%s / %s", OrbotService.formatBandwidthCount(oma, download), oma.formatTotal(totalRead))); + oma.uploadText.setText(String.format("%s / %s", OrbotService.formatBandwidthCount(oma, upload), oma.formatTotal(totalWrite))); break; case MESSAGE_PORTS: diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ce02ae6e..f39279c0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -191,6 +191,4 @@ <string name="confirm">Bestätigen</string> <string name="mebibyte">MiB</string> <string name="kibibyte">KiB</string> - <string name="mebibyte_per_second">MiB/s</string> - <string name="kibibyte_per_second">KiB/s</string> </resources> \ No newline at end of file diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index ded7bbd1..5f21a884 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -208,8 +208,6 @@ <string name="pref_circuit_padding">Bourrage du circuit</string> <string name="mebibyte">Mio</string> <string name="kibibyte">Kio</string> - <string name="mebibyte_per_second">Mio/s</string> - <string name="kibibyte_per_second">Kio/s</string> <string name="get_bridges_email_request">Demander des ponts par courriel</string> <string name="be_a_snowflake_desc">Autorisez les autres utilisateurs de Tor de se connecter à Tor par votre appareil</string> <string name="be_a_snowflake_title">Exécuter le mandataire Snowflake</string> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index da866d6b..3e4d252b 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -209,8 +209,6 @@ <string name="testing_tor_direct">Prófa tengingu við Tor…</string> <string name="get_bridges_email_request">Biðja um brýr með tölvupósti</string> <string name="mebibyte">MiB</string> - <string name="mebibyte_per_second">MiB/sek</string> - <string name="kibibyte_per_second">KiB/sek</string> <string name="be_a_snowflake_desc">Leyfa öðrum Tor-notendum að tengjast Tor í gegnum tækið þitt</string> <string name="be_a_snowflake_title">Keyra Snowflake-milliþjón</string> <string name="backup_port_exist">Villa: Önnur onion-þjónusta er þegar að nota gátt %s</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index c321c857..2bd99bad 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -209,8 +209,6 @@ <string name="get_bridges_email_request">Forespør broer via e-post</string> <string name="mebibyte">MiB</string> <string name="kibibyte">KiB</string> - <string name="mebibyte_per_second">MiB/s</string> - <string name="kibibyte_per_second">KiB/s</string> <string name="confirm">Bekreft</string> <string name="deny">Nekt</string> <string name="allow">Tillat</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e02b7c9d..72de6735 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -209,8 +209,6 @@ <string name="get_bridges_email_request">Solicite Pontes através do E-mail</string> <string name="mebibyte">MiB</string> <string name="kibibyte">KiB</string> - <string name="mebibyte_per_second">MiB/s</string> - <string name="kibibyte_per_second">KiB/s</string> <string name="be_a_snowflake_desc">Permita que os outros usuários do Tor se conectem ao Tor através do seu dispositivo</string> <string name="be_a_snowflake_title">Execute o proxy Snowflake</string> <string name="confirm">Confirme</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index de30e512..42998eb4 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -225,8 +225,6 @@ <string name="get_bridges_email_request">Solicite Pontes através do E-mail</string> <string name="mebibyte">MiB</string> <string name="kibibyte">KiB</string> - <string name="mebibyte_per_second">MiB/s</string> - <string name="kibibyte_per_second">KiB/s</string> <string name="deny">Negue</string> <string name="allow">Permita</string> </resources> \ No newline at end of file diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 663fa605..54971155 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -225,8 +225,6 @@ <string name="get_bridges_email_request">Solicite Pontes através do E-mail</string> <string name="mebibyte">MiB</string> <string name="kibibyte">KiB</string> - <string name="mebibyte_per_second">MiB/s</string> - <string name="kibibyte_per_second">KiB/s</string> <string name="deny">Negue</string> <string name="allow">Permita</string> </resources> \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 00448b24..c3aabe43 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -209,8 +209,6 @@ <string name="get_bridges_email_request">Köprüleri E-postayla İste</string> <string name="mebibyte">MiB</string> <string name="kibibyte">KiB</string> - <string name="mebibyte_per_second">MiB/s</string> - <string name="kibibyte_per_second">KiB/s</string> <string name="be_a_snowflake_desc">Diğer Tor kullanıcılarının aygıtınız üzerinden Tor\'a bağlanmasına izin verin</string> <string name="be_a_snowflake_title">Snowflake Vekil Sunucusu Çalıştır</string> <string name="confirm">Onayla</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 241ddaed..9f8914a1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -205,8 +205,6 @@ <string name="get_bridges_email_request">Запитувати мости електронною поштою</string> <string name="mebibyte">МіБ</string> <string name="kibibyte">КіБ</string> - <string name="mebibyte_per_second">МіБ/с</string> - <string name="kibibyte_per_second">КіБ/с</string> <string name="pref_reduced_circuit_padding_summary">Використання нижчих накладних алгоритмів заповнення для скорочення використання даних і акумулятора</string> <string name="pref_reduced_circuit_padding">Скорочене заповнення ланцюжка</string> <string name="pref_circuit_padding_summary">Увімкнути заповнення ланцюжка для захисту від деяких форм аналізу трафіку</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 4b5fb960..3f3ae194 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -204,8 +204,6 @@ <string name="v2_hidden_services">Dịch vụ Onion v2 (Không được hỗ trợ nữa)</string> <string name="mebibyte">MiB</string> <string name="kibibyte">KiB</string> - <string name="mebibyte_per_second">MiB/s</string> - <string name="kibibyte_per_second">KiB/s</string> <string name="refresh_apps">Làm mới các ứng dụng</string> <string name="default_socks_http">SOCKS: - HTTP: -</string> <string name="app_services">Dịch vụ ứng dụng</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 77153306..ef7253bc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -209,8 +209,6 @@ <string name="get_bridges_email_request">通过电子邮件请求网桥</string> <string name="mebibyte">MiB</string> <string name="kibibyte">KiB</string> - <string name="mebibyte_per_second">MiB/秒</string> - <string name="kibibyte_per_second">KiB/秒</string> <string name="be_a_snowflake_desc">允许其他 Tor 用户通过你的设备连接到 Tor</string> <string name="be_a_snowflake_title">运行 Snowflake 代理</string> <string name="confirm">确认</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 55637899..07b7dda1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -144,8 +144,6 @@ <string name="pref_torrc_dialog">Custom Torrc</string> - <string name="kibibyte_per_second">KiB/s</string> - <string name="mebibyte_per_second">MiB/s</string> <string name="kibibyte">KiB</string> <string name="mebibyte">MiB</string> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 099653ae..3b802aff 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -60,10 +60,12 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.PrintStream; import java.io.PrintWriter; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.Locale; import java.util.Objects; import java.util.Random; import java.util.StringTokenizer; @@ -1188,6 +1190,16 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return extraLines; } + public static String formatBandwidthCount(Context context, long bitsPerSecond) { + NumberFormat nf = NumberFormat.getInstance(Locale.getDefault()); + if (bitsPerSecond < 1e6) + return nf.format(Math.round(((float) ((int) (bitsPerSecond * 10 / 1024)) / 10))) + + context.getString(R.string.kibibyte_per_second); + else + return nf.format(Math.round(((float) ((int) (bitsPerSecond * 100 / 1024 / 1024)) / 100))) + + context.getString(R.string.mebibyte_per_second); + } + private void addV3OnionServicesToTorrc(StringBuffer torrc, ContentResolver contentResolver) { try { Cursor onionServices = contentResolver.query(V3_ONION_SERVICES_CONTENT_URI, V3_ONION_SERVICE_PROJECTION, OnionService.ENABLED + "=1", null, null); diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java index 5d204f70..29af35f7 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java @@ -1,16 +1,15 @@ package org.torproject.android.service; import android.text.TextUtils; +import android.util.Log; import net.freehaven.tor.control.EventHandler; import org.torproject.android.service.util.ExternalIPFetcher; import org.torproject.android.service.util.Prefs; -import java.text.NumberFormat; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.StringTokenizer; /** @@ -19,18 +18,15 @@ import java.util.StringTokenizer; public class TorEventHandler implements EventHandler, TorServiceConstants { private final static int BW_THRESDHOLD = 10000; - private OrbotService mService; + private final OrbotService mService; private long lastRead = -1; private long lastWritten = -1; private long mTotalTrafficWritten = 0; private long mTotalTrafficRead = 0; - private NumberFormat mNumberFormat; - private HashMap<String, Node> hmBuiltNodes = new HashMap<>(); + private final HashMap<String, Node> hmBuiltNodes = new HashMap<>(); public TorEventHandler(OrbotService service) { mService = service; - mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers! - } public HashMap<String, Node> getNodes() { @@ -39,7 +35,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { @Override public void message(String severity, String msg) { - + Log.d("bim", "message: " + msg); if (severity.equalsIgnoreCase("debug")) mService.debug(severity + ": " + msg); else @@ -94,11 +90,12 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { if (read > 0 || written > 0) iconId = R.drawable.ic_stat_tor_xfer; - String sb = formatCount(read) + + String sb = OrbotService.formatBandwidthCount(mService, read) + " \u2193" + " / " + - formatCount(written) + + OrbotService.formatBandwidthCount(mService, written) + " \u2191"; + Log.d("bim", "bandWidthUsed " + read + ", " + written); mService.showToolbarNotification(sb, OrbotService.NOTIFY_ID, iconId); mTotalTrafficWritten += written; @@ -115,22 +112,6 @@ public class TorEventHandler implements EventHandler, TorServiceConstants { } - private String formatCount(long count) { - // Converts the supplied argument into a string. - - // Under 2Mb, returns "xxx.xKb" - // Over 2Mb, returns "xxx.xxMb" - if (mNumberFormat != null) - if (count < 1e6) - return mNumberFormat.format(Math.round((float) ((int) (count * 10 / 1024)) / 10)) + "kbps"; - else - return mNumberFormat.format(Math.round((float) ((int) (count * 100 / 1024 / 1024)) / 100)) + "mbps"; - else - return ""; - - //return count+" kB"; - } - public void circuitStatus(String status, String circID, String path) { /* once the first circuit is complete, then announce that Orbot is on*/ diff --git a/orbotservice/src/main/res/values-de/strings.xml b/orbotservice/src/main/res/values-de/strings.xml index 42e901f4..821e9dcd 100644 --- a/orbotservice/src/main/res/values-de/strings.xml +++ b/orbotservice/src/main/res/values-de/strings.xml @@ -23,4 +23,6 @@ <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string> <string name="newnym">Sie haben zu einer neuen Tor-Identität gewechselt!</string> <string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> </resources> diff --git a/orbotservice/src/main/res/values-fr-rFR/strings.xml b/orbotservice/src/main/res/values-fr-rFR/strings.xml index f6031429..8d98d8d8 100644 --- a/orbotservice/src/main/res/values-fr-rFR/strings.xml +++ b/orbotservice/src/main/res/values-fr-rFR/strings.xml @@ -23,4 +23,6 @@ <string name="unable_to_start_tor">Impossible de démarrer Tor :</string> <string name="newnym">Vous avez basculé vers une nouvelle identité Tor !</string> <string name="updating_settings_in_tor_service">mise à jour des paramètres dans le service Tor</string> + <string name="mebibyte_per_second">Mio/s</string> + <string name="kibibyte_per_second">Kio/s</string> </resources> diff --git a/orbotservice/src/main/res/values-is/strings.xml b/orbotservice/src/main/res/values-is/strings.xml index 90f75a88..742dffa4 100644 --- a/orbotservice/src/main/res/values-is/strings.xml +++ b/orbotservice/src/main/res/values-is/strings.xml @@ -22,4 +22,7 @@ <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string> <string name="newnym">Þú ert komin með nýtt Tor auðkenni!</string> <string name="updating_settings_in_tor_service">uppfæri stillingar í Tor þjónustu</string> + + <string name="mebibyte_per_second">MiB/sek</string> + <string name="kibibyte_per_second">KiB/sek</string> </resources> diff --git a/orbotservice/src/main/res/values-nb/strings.xml b/orbotservice/src/main/res/values-nb/strings.xml index 0f7d44ae..584a7ba8 100644 --- a/orbotservice/src/main/res/values-nb/strings.xml +++ b/orbotservice/src/main/res/values-nb/strings.xml @@ -22,4 +22,6 @@ <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string> <string name="newnym">Du har byttet til en ny Tor-identitet!</string> <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> </resources> diff --git a/orbotservice/src/main/res/values-pt-rBR/strings.xml b/orbotservice/src/main/res/values-pt-rBR/strings.xml index 847f7aef..f62530aa 100644 --- a/orbotservice/src/main/res/values-pt-rBR/strings.xml +++ b/orbotservice/src/main/res/values-pt-rBR/strings.xml @@ -23,4 +23,6 @@ <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string> <string name="newnym">Você trocou para uma nova identidade Tor!</string> <string name="updating_settings_in_tor_service">atualizando configurações no serviço Tor</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> </resources> diff --git a/orbotservice/src/main/res/values-pt-rPT/strings.xml b/orbotservice/src/main/res/values-pt-rPT/strings.xml index 2f8e5113..d34f1b24 100644 --- a/orbotservice/src/main/res/values-pt-rPT/strings.xml +++ b/orbotservice/src/main/res/values-pt-rPT/strings.xml @@ -9,4 +9,7 @@    + + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> </resources> diff --git a/orbotservice/src/main/res/values-pt/strings.xml b/orbotservice/src/main/res/values-pt/strings.xml index 9266d81d..f73e0c7d 100644 --- a/orbotservice/src/main/res/values-pt/strings.xml +++ b/orbotservice/src/main/res/values-pt/strings.xml @@ -19,4 +19,6 @@ <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string> <string name="newnym">Mudou para uma nova identidade do Tor!</string> <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> </resources> diff --git a/orbotservice/src/main/res/values-tr/strings.xml b/orbotservice/src/main/res/values-tr/strings.xml index 8fdc1085..249b42d5 100644 --- a/orbotservice/src/main/res/values-tr/strings.xml +++ b/orbotservice/src/main/res/values-tr/strings.xml @@ -23,4 +23,6 @@ <string name="unable_to_start_tor">Tor başlatılamadı:</string> <string name="newnym">Yeni bir Tor kimliğine geçiş yaptınız!</string> <string name="updating_settings_in_tor_service">Tor hizmet ayarları güncellemesi</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> </resources> diff --git a/orbotservice/src/main/res/values-uk/strings.xml b/orbotservice/src/main/res/values-uk/strings.xml index da62e234..34860e4c 100644 --- a/orbotservice/src/main/res/values-uk/strings.xml +++ b/orbotservice/src/main/res/values-uk/strings.xml @@ -22,4 +22,6 @@ <string name="unable_to_start_tor">Неможливо запустити Tor:</string> <string name="newnym">Ви перемкнулись на новий ідентифікатор Tor!</string> <string name="updating_settings_in_tor_service">оновлення налаштувань у сервісі Tor</string> + <string name="mebibyte_per_second">МіБ/с</string> + <string name="kibibyte_per_second">КіБ/с</string> </resources> diff --git a/orbotservice/src/main/res/values-vi/strings.xml b/orbotservice/src/main/res/values-vi/strings.xml index e5b39dff..aee8a4f2 100644 --- a/orbotservice/src/main/res/values-vi/strings.xml +++ b/orbotservice/src/main/res/values-vi/strings.xml @@ -23,4 +23,6 @@ <string name="unable_to_start_tor">Không thể khởi động Tor được: </string> <string name="newnym">Bạn đã chuyển sang một mạch Tor mới!</string> <string name="updating_settings_in_tor_service">đang cập nhật cài đặt dịch vụ Tor</string> + <string name="mebibyte_per_second">MiB/s</string> + <string name="kibibyte_per_second">KiB/s</string> </resources> diff --git a/orbotservice/src/main/res/values-zh-rCN/strings.xml b/orbotservice/src/main/res/values-zh-rCN/strings.xml index 888444a0..a79da66f 100644 --- a/orbotservice/src/main/res/values-zh-rCN/strings.xml +++ b/orbotservice/src/main/res/values-zh-rCN/strings.xml @@ -23,4 +23,6 @@ <string name="unable_to_start_tor">无法启动 Tor：</string> <string name="newnym">已切换为新的 Tor 标识！</string> <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string> + <string name="mebibyte_per_second">MiB/秒</string> + <string name="kibibyte_per_second">KiB/秒</string> </resources> diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml index 4d1a65b9..ed3464ac 100644 --- a/orbotservice/src/main/res/values/strings.xml +++ b/orbotservice/src/main/res/values/strings.xml @@ -22,4 +22,9 @@ <string name="menu_new_identity">New Identity</string> <string name="waiting_for_control_port">Waiting for control port...</string> <string name="connecting_to_control_port">Connecting to control port:</string> + + <string name="kibibyte_per_second">KiB/s</string> + <string name="mebibyte_per_second">MiB/s</string> + </resources> +

1 0

[orbot/master] Merge branch 'bitmold-IPtProxyPorts'
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 5fc9f8724a9081980e9cdcc99540d758faaae45c Merge: 0d950796 99f2aa53 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu May 27 11:08:38 2021 -0400 Merge branch 'bitmold-IPtProxyPorts' app/build.gradle | 2 +- .../android/ui/onboarding/MoatActivity.java | 6 ++-- orbotservice/build.gradle | 2 +- .../torproject/android/service/OrbotService.java | 33 +++++++++------------- orbotservice/src/main/res/raw/bridges.txt | 2 +- 5 files changed, 20 insertions(+), 25 deletions(-)

1 0

[orbot/master] not needed in appcore build.gradle
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2041ec1d79d4b7050d96458719547dbe4b569f33 Author: bim <dsnake(a)protonmail.com> Date: Tue Jun 1 20:49:02 2021 -0400 not needed in appcore build.gradle --- appcore/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/appcore/build.gradle b/appcore/build.gradle index 035af370..6c6e3bbf 100644 --- a/appcore/build.gradle +++ b/appcore/build.gradle @@ -29,7 +29,6 @@ android { } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.appcompat:appcompat:1.2.0'

1 0

[orbot/master] update bridge line for snowflake
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 99f2aa5367177c3c26e5d8d24d04c7d919a627ca Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu May 27 11:08:22 2021 -0400 update bridge line for snowflake --- orbotservice/src/main/res/raw/bridges.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/res/raw/bridges.txt b/orbotservice/src/main/res/raw/bridges.txt index 54377f1a..110b0b86 100644 --- a/orbotservice/src/main/res/raw/bridges.txt +++ b/orbotservice/src/main/res/raw/bridges.txt @@ -5,4 +5,4 @@ obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWOD obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0 obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com -Bridge snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72 +snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72

1 0