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

[snowflake-mobile/master] Handled Invalid STUD URL
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit fba786cd9c4d8f35f22b277228f2757eebc34dda Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jul 7 22:07:58 2020 +0530 Handled Invalid STUD URL --- .../main/java/org/torproject/snowflake/MyPersistentService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 2e98501..62f1d3f 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -417,8 +417,15 @@ public class MyPersistentService extends Service { * @param t */ public void offerRequestFailure(Throwable t) { + if (t instanceof NullPointerException) { + //We don't want to resend the request for offer unless user gives a valid URL and restarts the service. + updateNotification("Invalid STUN server assigned. Please verify and restart."); + closeConnections(false); + return; + } updateNotification("Request failed, retrying..."); Log.d(TAG, "requestFailure: " + t.getMessage()); + t.printStackTrace(); isConnectionAlive = false; }

1 0

[snowflake-mobile/master] Handled Invalid Broker URL
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit 23595b83b3132b85ef470fad34f499e21124093c Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jul 7 21:47:24 2020 +0530 Handled Invalid Broker URL --- .../org/torproject/snowflake/MyPersistentService.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index c5baf30..2e98501 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -365,7 +365,17 @@ public class MyPersistentService extends Service { isConnectionAlive = true; //Considering connection is alive from now on, until it is set to false. Log.d(TAG, "fetchOffer: Fetching offer from broker."); ///Retrofit call - final GetOfferService getOfferService = RetroServiceGenerator.createService(GetOfferService.class); + final GetOfferService getOfferService; + try { + getOfferService = RetroServiceGenerator.createService(GetOfferService.class); + } catch (IllegalArgumentException e) { + updateNotification("Incorrect Broker URL entered. Please verify and restart."); + //We don't want to resend the request for offer unless user gives a valid URL and restarts the service. + closeConnections(false); + e.printStackTrace(); + return; + } + Observable<SDPOfferResponse> offer = getOfferService.getOffer(GlobalApplication.getHeadersMap(), new OfferRequestBody(sidHelper.generateSid())); compositeDisposable.add( offer.subscribeOn(Schedulers.io()) @@ -470,7 +480,7 @@ public class MyPersistentService extends Service { mainDataChannel.close(); if (mainPeerConnection != null) mainPeerConnection.close(); - if (webSocket != null && isWebSocketOpen){ + if (webSocket != null && isWebSocketOpen) { webSocket.close(1000, "Normal closure"); isWebSocketOpen = false; } @@ -520,7 +530,7 @@ public class MyPersistentService extends Service { } }); } catch (IllegalArgumentException e) { - updateNotification("Invalid Relay URL entered. Verify and restart."); + updateNotification("Incorrect Relay URL entered. Please verify and restart."); e.printStackTrace(); //We don't want to resend the request for offer unless user gives a valid URL and restarts the service. closeConnections(false);

1 0

[snowflake-mobile/master] Reformated the exception block in startWebSocket function
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit 70093a2e65ae50557887cda37f91ea0f2fa36bc4 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Jul 9 00:10:37 2020 +0530 Reformated the exception block in startWebSocket function --- .../torproject/snowflake/MyPersistentService.java | 73 +++++++++++----------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index c007e72..6e5fe23 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -504,48 +504,51 @@ public class MyPersistentService extends Service { /////////////// Web Socket //////////////////////// private void startWebSocket() { - OkHttpClient client = new OkHttpClient(); + Request req; try { - Request req = new Request.Builder().url(GlobalApplication.getWebSocketUrl()).build(); - webSocket = client.newWebSocket(req, - new WebSocketListener() { - @Override - public void onClosed(@NotNull WebSocket webSocket, int code, @NotNull String reason) { - Log.d(TAG, "WebSocketListener: onClosed: "); - isWebSocketOpen = false; - } - - @Override - public void onClosing(@NotNull WebSocket webSocket, int code, @NotNull String reason) { - Log.d(TAG, "WebSocketListener: onClosing: "); - isWebSocketOpen = false; - } - - @Override - public void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t, @org.jetbrains.annotations.Nullable Response response) { - Log.d(TAG, "WebSocketListener: onFailure: "); - isWebSocketOpen = false; - } - - @Override - public void onMessage(@NotNull WebSocket webSocket, @NotNull ByteString bytes) { - Log.d(TAG, "WebSocketListener: onMessage: Bytes"); - mainDataChannel.send(RelaySerialization.torToClient(bytes)); - } - - @Override - public void onOpen(@NotNull WebSocket webSocket, @NotNull Response response) { - Log.d(TAG, "WebSocketListener: onOpen: "); - isWebSocketOpen = true; - } - }); + req = new Request.Builder().url(GlobalApplication.getWebSocketUrl()).build(); } catch (IllegalArgumentException e) { updateNotification("Incorrect Relay URL entered. Please verify and restart."); e.printStackTrace(); - //We don't want to resend the request for offer unless user gives a valid URL and restarts the service. + //We don't want to resend the request for offer unless user gives a valid URL and restart the service. closeConnections(false); + return; } + OkHttpClient client = new OkHttpClient(); + webSocket = client.newWebSocket(req, + new WebSocketListener() { + @Override + public void onClosed(@NotNull WebSocket webSocket, int code, @NotNull String reason) { + Log.d(TAG, "WebSocketListener: onClosed: "); + isWebSocketOpen = false; + } + + @Override + public void onClosing(@NotNull WebSocket webSocket, int code, @NotNull String reason) { + Log.d(TAG, "WebSocketListener: onClosing: "); + isWebSocketOpen = false; + } + + @Override + public void onFailure(@NotNull WebSocket webSocket, @NotNull Throwable t, @org.jetbrains.annotations.Nullable Response response) { + Log.d(TAG, "WebSocketListener: onFailure: "); + isWebSocketOpen = false; + } + + @Override + public void onMessage(@NotNull WebSocket webSocket, @NotNull ByteString bytes) { + Log.d(TAG, "WebSocketListener: onMessage: Bytes"); + mainDataChannel.send(RelaySerialization.torToClient(bytes)); + } + + @Override + public void onOpen(@NotNull WebSocket webSocket, @NotNull Response response) { + Log.d(TAG, "WebSocketListener: onOpen: "); + isWebSocketOpen = true; + } + }); + client.dispatcher().executorService().shutdown(); } }

1 0

[snowflake-mobile/master] Handled ICE connection failed state
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit fecb5fa01746bf4fc3541bb2da908751dd715ae8 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jul 7 22:50:41 2020 +0530 Handled ICE connection failed state --- .../main/java/org/torproject/snowflake/MyPeerConnectionObserver.java | 3 ++- app/src/main/java/org/torproject/snowflake/MyPersistentService.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPeerConnectionObserver.java b/app/src/main/java/org/torproject/snowflake/MyPeerConnectionObserver.java index 5d96dae..260833a 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPeerConnectionObserver.java +++ b/app/src/main/java/org/torproject/snowflake/MyPeerConnectionObserver.java @@ -26,7 +26,8 @@ public class MyPeerConnectionObserver implements PeerConnection.Observer { @Override public void onIceConnectionChange(PeerConnection.IceConnectionState iceConnectionState) { Log.d(TAG, "onIceConnectionChange: " + iceConnectionState); - //TODO:Handle Connection Failure. + if (iceConnectionState == PeerConnection.IceConnectionState.FAILED) + peerconnectionObserverCallback.iceConnectionFailed(); } @Override diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 07fc37c..c007e72 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -308,7 +308,8 @@ public class MyPersistentService extends Service { @Override public void iceConnectionFailed() { Log.d(TAG, "iceConnectionFailed: "); - //TODO: Figuring out with trac ticket. + //Connection is terminated when ICE connection reaches FAILED state. + closeConnections(true); } @Override

1 0

[snowflake/master] Use STUN server compatable with RFC 5780 in proxy
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit 8c875f0ba7775519b13118458d350dcae478af6a Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Jul 9 09:55:41 2020 -0400 Use STUN server compatable with RFC 5780 in proxy --- proxy/snowflake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/snowflake.go b/proxy/snowflake.go index a1886c2..464fbb0 100644 --- a/proxy/snowflake.go +++ b/proxy/snowflake.go @@ -29,7 +29,7 @@ import ( const defaultBrokerURL = "https://snowflake-broker.bamsoftware.com/" const defaultRelayURL = "wss://snowflake.bamsoftware.com/" -const defaultSTUNURL = "stun:stun.l.google.com:19302" +const defaultSTUNURL = "stun:stun.stunprotocol.org:3478" const pollInterval = 5 * time.Second const ( NATUnknown = "unknown"

1 0

[translation/whisperback_completed] https://gitweb.torproject.org/translation.git/commit/?h=whisperback_completed
by translation＠torproject.org 10 Jul '20

10 Jul '20

commit 996793150e6952b0f314fdf5d358024c0b229e8b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 10 09:48:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback_complet… --- hr/hr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hr/hr.po b/hr/hr.po index e9c59ae0b7..3eed498def 100644 --- a/hr/hr.po +++ b/hr/hr.po @@ -3,8 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Milo Ivir <mail(a)milotype.de>, 2020 -# Milo Ivir <mail(a)milotype.de>, 2020 +# milotype <mail(a)milotype.de>, 2020 +# milotype <mail(a)milotype.de>, 2020 # Nikola Parsifal <anchorsound(a)gmail.com>, 2014 # Vlado V. <vlays(a)mail.com>, 2015 msgid "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" "PO-Revision-Date: 2020-04-10 13:45+0000\n" -"Last-Translator: Milo Ivir <mail(a)milotype.de>\n" +"Last-Translator: milotype <mail(a)milotype.de>\n" "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/torcheck_completed] https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed
by translation＠torproject.org 10 Jul '20

10 Jul '20

commit 7230d3e37a105730b41cf9363ce429a12560dc98 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 10 09:47:58 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed --- hr/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr/torcheck.po b/hr/torcheck.po index 1296453734..0271a02632 100644 --- a/hr/torcheck.po +++ b/hr/torcheck.po @@ -3,7 +3,7 @@ # # Translators: # cisterna, 2012 -# Milo Ivir <mail(a)milotype.de>, 2020 +# milotype <mail(a)milotype.de>, 2020 # nvucinic <nvucinic(a)nestabilni.com>, 2012 # 0Ensó0 <zelena990(a)gmail.com>, 2015 msgid "" @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" "PO-Revision-Date: 2020-04-10 15:47+0000\n" -"Last-Translator: Milo Ivir <mail(a)milotype.de>\n" +"Last-Translator: milotype <mail(a)milotype.de>\n" "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor-and-https_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https_completed
by translation＠torproject.org 10 Jul '20

10 Jul '20

commit 5db263f5764efbbd79270e7db8ad9c0b46166c72 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 10 09:47:24 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https_compl… --- hr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr.po b/hr.po index f8c99a4924..897738f2c1 100644 --- a/hr.po +++ b/hr.po @@ -1,14 +1,14 @@ # # Translators: # Igor <lyricaltumor(a)gmail.com>, 2016 -# Milo Ivir <mail(a)milotype.de>, 2020 +# milotype <mail(a)milotype.de>, 2020 # Vlado V. <vlays(a)mail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" "PO-Revision-Date: 2020-04-10 14:14+0000\n" -"Last-Translator: Milo Ivir <mail(a)milotype.de>\n" +"Last-Translator: milotype <mail(a)milotype.de>\n" "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 10 Jul '20

10 Jul '20

commit b6d73ba6b7ddfed031b5356bbc7e8c88b9b6b172 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 10 09:47:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+hr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+hr.po b/contents+hr.po index 7916b36be3..983f9b60ca 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -3,7 +3,7 @@ # erinm, 2019 # Josip Domšić <josip.domsic(a)gmail.com>, 2019 # Emma Peel, 2020 -# Milo Ivir <mail(a)milotype.de>, 2020 +# milotype <mail(a)milotype.de>, 2020 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Milo Ivir <mail(a)milotype.de>, 2020\n" +"Last-Translator: milotype <mail(a)milotype.de>, 2020\n" "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 10 Jul '20

10 Jul '20

commit a945ecbae5d687fa5f495965a8c4d4acf3c94d4e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 10 09:47:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+hr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+hr.po b/contents+hr.po index 7916b36be3..983f9b60ca 100644 --- a/contents+hr.po +++ b/contents+hr.po @@ -3,7 +3,7 @@ # erinm, 2019 # Josip Domšić <josip.domsic(a)gmail.com>, 2019 # Emma Peel, 2020 -# Milo Ivir <mail(a)milotype.de>, 2020 +# milotype <mail(a)milotype.de>, 2020 # msgid "" msgstr "" @@ -11,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-12 08:00+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Milo Ivir <mail(a)milotype.de>, 2020\n" +"Last-Translator: milotype <mail(a)milotype.de>, 2020\n" "Language-Team: Croatian (https://www.transifex.com/otf/teams/1519/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0