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

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 18 Jun '20

18 Jun '20

commit 84fceb88170db193234277a5f317f8d4f89a2975 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 18 16:45:47 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- da.po | 16 ++++++++-------- es.po | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/da.po b/da.po index 31ec03b12d..a49c20e9cd 100644 --- a/da.po +++ b/da.po @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-04 13:11+0200\n" -"PO-Revision-Date: 2020-06-18 12:35+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-06-18 16:31+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -842,7 +842,7 @@ msgstr "Kan ikke finde drevet som Tails kører fra. Måske bruger du 'toram'-val #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42 msgid "Import Failed" -msgstr "" +msgstr "Import mislykkedes" #. Translators: Don't translate {path} or {error}, #. they are placeholders and will be replaced. @@ -851,13 +851,13 @@ msgstr "" msgid "" "Failed to import keys from {path}:\n" "{error}" -msgstr "" +msgstr "Kunne ikke importere nøgler fra {path}:\n{error}" #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50 msgid "Key Imported" msgid_plural "Keys Imported" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Nøgle importeret" +msgstr[1] "Nøgler importeret" #. Translators: Don't translate {uids}, it's a placeholder and #. will be replaced. @@ -865,8 +865,8 @@ msgstr[1] "" #, python-brace-format msgid "Imported a key for {uids}" msgid_plural "Imported keys for {uids}" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Importerede en nøgle for {uids}" +msgstr[1] "Importerede nøgler for {uids}" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Lock screen" diff --git a/es.po b/es.po index 18c79ab8fa..afc7f62536 100644 --- a/es.po +++ b/es.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-04 13:11+0200\n" -"PO-Revision-Date: 2020-06-18 12:35+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-06-18 16:42+0000\n" +"Last-Translator: eulalio barbero espinosa <eulaliob(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -840,7 +840,7 @@ msgstr "La unidad desde la que se está ejecutando Tails no se puede encontrar. #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42 msgid "Import Failed" -msgstr "" +msgstr "La importación falló" #. Translators: Don't translate {path} or {error}, #. they are placeholders and will be replaced. @@ -849,7 +849,7 @@ msgstr "" msgid "" "Failed to import keys from {path}:\n" "{error}" -msgstr "" +msgstr "Error al importar las claves de {path}:\n{error}" #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:50 msgid "Key Imported"

1 0

[snowflake-mobile/master] Changed notification importance
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit 4689fd6ee62f049225c7103d38cc0b13f0bc227c Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jun 9 18:09:47 2020 +0530 Changed notification importance --- app/src/main/java/org/torproject/snowflake/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index b4ebcd8..1ac43dd 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -80,7 +80,7 @@ public class MainActivity extends AppCompatActivity { NotificationChannel channel = new NotificationChannel(ForegroundServiceConstants.NOTIFICATION_CHANNEL_ID, getString(R.string.not_channel_name), - NotificationManager.IMPORTANCE_HIGH); + NotificationManager.IMPORTANCE_LOW); channel.setDescription(getString(R.string.not_channel_desc)); channel.enableLights(true); channel.setLightColor(Color.RED);

1 0

[snowflake-mobile/master] Allowed HTTP/Unsecured calls over network
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit 36c5cc1a037df26f278401e3b86311e288870a10 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Jun 17 23:12:55 2020 +0530 Allowed HTTP/Unsecured calls over network --- app/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7728955..6b366fb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,7 +14,8 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + android:usesCleartextTraffic="true"> <service android:name="org.torproject.snowflake.MyPersistentService"

1 0

[snowflake-mobile/master] Changed tag of WakeLock for easier debugging
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit 1d96efd5a791cbf4e5a3ca7d5f0c418143d89bf3 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jun 13 14:53:36 2020 +0530 Changed tag of WakeLock for easier debugging --- app/src/main/java/org/torproject/snowflake/MyPersistentService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 8b20772..b888700 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -194,7 +194,7 @@ public class MyPersistentService extends Service { sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_RUNNING); //Editing the shared preferences PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, - "MyApp::MyWakelockTag"); + "Snowflake::MyPersistentService"); wakeLock.acquire(); //WakeLock acquired for unlimited amount of time. ///

1 0

[snowflake-mobile/master] Added read time-out for OkHttpClient
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit fd5ab01e54c0c271ead577b7100010cd6714afba Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Jun 17 23:24:22 2020 +0530 Added read time-out for OkHttpClient --- .../org/torproject/snowflake/services/RetroServiceGenerator.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/snowflake/services/RetroServiceGenerator.java b/app/src/main/java/org/torproject/snowflake/services/RetroServiceGenerator.java index 9bbb945..43d80fd 100644 --- a/app/src/main/java/org/torproject/snowflake/services/RetroServiceGenerator.java +++ b/app/src/main/java/org/torproject/snowflake/services/RetroServiceGenerator.java @@ -3,6 +3,8 @@ package org.torproject.snowflake.services; import org.torproject.snowflake.BuildConfig; import org.torproject.snowflake.GlobalApplication; +import java.util.concurrent.TimeUnit; + import hu.akarnokd.rxjava3.retrofit.RxJava3CallAdapterFactory; import okhttp3.OkHttpClient; import okhttp3.logging.HttpLoggingInterceptor; @@ -21,7 +23,9 @@ public class RetroServiceGenerator { OkHttpClient.Builder httpClient = new OkHttpClient.Builder(); - //TODO:Set Custom Time Out (Long Polling) + //Setting a custom timeouts. + httpClient.readTimeout(15, TimeUnit.SECONDS); + if (BuildConfig.DEBUG) { HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(); interceptor.level(HttpLoggingInterceptor.Level.BODY);

1 0

[snowflake-mobile/master] Added broker endpoint in Global Application
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit e4ec977d104e1a31522b6bdc93b27d2a09736701 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jun 9 15:13:38 2020 +0530 Added broker endpoint in Global Application --- .../main/java/org/torproject/snowflake/GlobalApplication.java | 11 +++++++++++ .../java/org/torproject/snowflake/MyPersistentService.java | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/GlobalApplication.java b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java new file mode 100644 index 0000000..288733d --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java @@ -0,0 +1,11 @@ +package org.torproject.snowflake; + +import android.app.Application; + +public class GlobalApplication extends Application { + private final static String BROKER_URL = "http://10.0.2.2:8080"; //10.0.2.2 is used to access computer's local host from Android Emulator. + + public static String getBrokerUrl() { + return BROKER_URL; + } +} diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index ecb39ee..ddb418f 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -195,7 +195,7 @@ public class MyPersistentService extends Service { private void startWebRTCConnection() { initializePeerConnectionFactory(); //Android Specific, you can Ignore. mainPeerConnection = createPeerConnection(factory); //Creating New Peer Connection. - //TODO: Fetch offer from broker + fetchOffer(); } /** @@ -312,7 +312,6 @@ public class MyPersistentService extends Service { */ public void offerRequestFailure(Throwable t) { Log.d(TAG, "requestFailure: " + t.getMessage()); - createPersistentNotification(true, "Failed getting offer. Retrying."); //TODO:Set a time out to resending offer. if (isServiceStarted) fetchOffer(); //Sending request for offer again.

1 0

[snowflake-mobile/master] Fixed Cancel service bug, cleared all calls while destrying service
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit 8cb4fb109a1761941a2e6b5daae1c8b67a88fe55 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jun 9 16:21:25 2020 +0530 Fixed Cancel service bug, cleared all calls while destrying service --- .../torproject/snowflake/MyPersistentService.java | 29 +++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 71545e6..f23fd0e 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -31,6 +31,7 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.LinkedList; import java.util.List; +import java.util.concurrent.TimeUnit; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.core.Observable; @@ -50,6 +51,7 @@ public class MyPersistentService extends Service { private boolean isServiceStarted; private PowerManager.WakeLock wakeLock; private Disposable serviceDisposable; + private NotificationManager mNotificationManager; @Nullable @@ -62,6 +64,7 @@ public class MyPersistentService extends Service { public int onStartCommand(Intent intent, int flags, int startId) { Log.d(TAG, "onStartCommand: executed with startId: " + startId); sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); + isServiceStarted = sharedPreferences.getBoolean(getString(R.string.is_service_running_bool), false); if (intent != null) { if (intent.getAction().equals(ForegroundServiceConstants.ACTION_START)) @@ -82,19 +85,27 @@ public class MyPersistentService extends Service { super.onCreate(); Log.d(TAG, "onCreate: Service Created"); + mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); //Assigning the shared preferences - sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_RUNNING); //Editing the shared preferences Notification notification = createPersistentNotification(false, null); startForeground(ForegroundServiceConstants.DEF_NOTIFICATION_ID, notification); } @Override public void onDestroy() { - Log.d(TAG, "onDestroy: Service Destroyed"); sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_STOPPED); + if (serviceDisposable != null) + serviceDisposable.dispose(); //Stopping the network request if it's running. + if (mainDataChannel != null) { + mainDataChannel.close(); + } + if (mainPeerConnection != null) { + mainPeerConnection.close(); + mainPeerConnection.dispose(); + } - //TODO: Dispose all connections. - + mNotificationManager.cancel(ForegroundServiceConstants.DEF_NOTIFICATION_ID); + Log.d(TAG, "onDestroy: Service Destroyed"); super.onDestroy(); } @@ -108,8 +119,10 @@ public class MyPersistentService extends Service { SharedPreferences.Editor editor = sharedPreferences.edit(); if (setState == ForegroundServiceConstants.SERVICE_RUNNING) { + isServiceStarted = true; editor.putBoolean(getString(R.string.is_service_running_bool), true); } else { + isServiceStarted = false; editor.putBoolean(getString(R.string.is_service_running_bool), false); } editor.apply(); @@ -121,8 +134,6 @@ public class MyPersistentService extends Service { */ private void updateNotification(String updateText) { Notification notification = createPersistentNotification(true, updateText); //Create a new notification. - - NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); mNotificationManager.notify(ForegroundServiceConstants.DEF_NOTIFICATION_ID, notification); } @@ -172,8 +183,8 @@ public class MyPersistentService extends Service { return; } Log.d(TAG, "startService: Starting foreground service"); - isServiceStarted = true; + sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_RUNNING); //Editing the shared preferences PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MyApp::MyWakelockTag"); @@ -197,7 +208,6 @@ public class MyPersistentService extends Service { } catch (Exception e) { Log.d(TAG, "stopService: Failed with: " + e.getMessage()); } - isServiceStarted = false; } /////////////// WebRTC //////////////////////// @@ -298,8 +308,9 @@ public class MyPersistentService extends Service { * @param sdpOfferResponse */ public void offerRequestSuccess(SDPOfferResponse sdpOfferResponse) { - createPersistentNotification(true, "Fetching offer success. Creating Answer."); + updateNotification("Fetching offer success. Creating Answer."); if (sdpOfferResponse.getStatus().equals(BrokerConstants.CLIENT_MATCH)) { + updateNotification("Client match, generating answer..."); Log.d(TAG, "requestSuccess: CLIENT MATCH"); try { SessionDescription offer = SDPSerializer.deserializeOffer(sdpOfferResponse.getOffer());

1 0

[snowflake-mobile/master] Network calls to send answer and establish connection
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit b0afeaa107ef9279c1c0cda38f3b5842077a66fc Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jun 9 17:59:36 2020 +0530 Network calls to send answer and establish connection --- .../torproject/snowflake/MyPersistentService.java | 85 +++++++++++++++++++++- .../snowflake/services/RetroServiceGenerator.java | 2 +- 2 files changed, 82 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 686156a..60cd0e0 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -18,11 +18,16 @@ import org.json.JSONException; import org.torproject.snowflake.constants.BrokerConstants; import org.torproject.snowflake.constants.ForegroundServiceConstants; import org.torproject.snowflake.interfaces.PeerConnectionObserverCallback; +import org.torproject.snowflake.pojo.AnsResponse; +import org.torproject.snowflake.pojo.AnswerBody; +import org.torproject.snowflake.pojo.AnswerBodySDP; import org.torproject.snowflake.pojo.OfferRequestBody; import org.torproject.snowflake.pojo.SDPOfferResponse; import org.torproject.snowflake.services.GetOfferService; import org.torproject.snowflake.services.RetroServiceGenerator; +import org.torproject.snowflake.services.SendAnswerService; import org.webrtc.DataChannel; +import org.webrtc.MediaConstraints; import org.webrtc.PeerConnection; import org.webrtc.PeerConnectionFactory; import org.webrtc.SessionDescription; @@ -209,7 +214,6 @@ public class MyPersistentService extends Service { Log.d(TAG, "stopService: Failed with: " + e.getMessage()); } } - /////////////// WebRTC //////////////////////// /** @@ -255,8 +259,8 @@ public class MyPersistentService extends Service { public void onIceGatheringFinish() { if (mainPeerConnection.connectionState() != PeerConnection.PeerConnectionState.CLOSED) { Log.d(TAG, "onIceGatheringFinish: Ice Gathering Finished. Sending Answer to broker...\n" + mainPeerConnection.getLocalDescription().description); - //Sending the SDP Answer to the server. - //TODO:Send Answer + //Ice gathering finished. Sending the SDP Answer to the server. + sendAnswer(mainPeerConnection.getLocalDescription()); } } @@ -282,12 +286,37 @@ public class MyPersistentService extends Service { @Override public void dataChannelStateChange(final DataChannel.State STATE) { Log.d(TAG, "dataChannelStateChange: Data Channel State: " + STATE); + if(STATE == DataChannel.State.OPEN){ + updateNotification("Connection Established. Serving one client."); + } } }); Log.d(TAG, "createPeerConnection: Finished creating peer connection."); return factory.createPeerConnection(rtcConfiguration, pcObserver); } + + /** + * Create SDP answer to send it to broker. + */ + private void createAnswer() { + Log.d(TAG, "createAnswer: Starting Creating Answer..."); + //CreateAnswer fires the request to get ICE candidates and finish the SDP. We can listen to all these events on the corresponding observers. + mainPeerConnection.createAnswer(new SimpleSdpObserver("Local: Answer") { + @Override + public void onCreateSuccess(SessionDescription sessionDescription) { + mainPeerConnection.setLocalDescription(new SimpleSdpObserver("Local"), sessionDescription); + //Wait till ICE Gathering/ Trickling is finished to send the answer. + } + + @Override + public void onCreateFailure(String s) { + Log.e(TAG, "onCreateFailure: FAILED:" + s); + } + }, new MediaConstraints()); + updateNotification("Answer creation finished, establishing connection..."); + } + /////////////// Network Calls //////////////////////// /** @@ -318,7 +347,7 @@ public class MyPersistentService extends Service { SessionDescription offer = SDPSerializer.deserializeOffer(sdpOfferResponse.getOffer()); Log.d(TAG, "requestSuccess: Remote Description (OFFER):\n" + offer.description); mainPeerConnection.setRemoteDescription(new SimpleSdpObserver("Remote: Offer"), offer); - //TODO: Create Answer + createAnswer(); } catch (JSONException e) { Log.d(TAG, "requestSuccess: Serialization Failed:"); e.printStackTrace(); @@ -342,4 +371,52 @@ public class MyPersistentService extends Service { if (isServiceStarted) fetchOffer(); //Sending request for offer again. } + + /** + * Sending answer to the broker. + */ + public void sendAnswer(SessionDescription sessionDescription) { + Log.d(TAG, "sendAnswer: Sending SDP Answer"); + AnswerBodySDP bodySDP = new AnswerBodySDP(); + bodySDP.setSdp(SDPSerializer.serializeAnswer(sessionDescription)); + AnswerBody body = new AnswerBody("555", bodySDP.toString()); //TODO:Use randomly Generate SID from sendRequest + SendAnswerService service = RetroServiceGenerator.createService(SendAnswerService.class); + Observable<AnsResponse> response = service.sendAnswer(body); + serviceDisposable = response.subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()).subscribe(this::answerResponseSuccess, this::answerResponseFailure); + } + + /** + * Sending answer to broker succeeded + * + * @param ansResponse + */ + private void answerResponseSuccess(AnsResponse ansResponse) { + if (ansResponse.getStatus().equals(BrokerConstants.CLIENT_GONE)) { + Log.d(TAG, "answerResponseSuccess: Client Gone"); + closeConnectionAndResend(); + } else { + Log.d(TAG, "answerResponseSuccess: Sending Success"); + } + } + + /** + * Sending answer to broker failed. + * + * @param throwable + */ + private void answerResponseFailure(Throwable throwable) { + Log.e(TAG, "answerResponseFailure: " + throwable.getMessage()); + } + + /** + * Closing the connection and resending the request to get SDP. + */ + private void closeConnectionAndResend() { + Log.d(TAG, "closeConnectionAndResend: Closing connection and resending request."); + //Closing both to avoid memory leak. + mainDataChannel.close(); + mainPeerConnection.close(); + fetchOffer(); //Sending request for offer again. + } } diff --git a/app/src/main/java/org/torproject/snowflake/services/RetroServiceGenerator.java b/app/src/main/java/org/torproject/snowflake/services/RetroServiceGenerator.java index 74f1d9d..9bbb945 100644 --- a/app/src/main/java/org/torproject/snowflake/services/RetroServiceGenerator.java +++ b/app/src/main/java/org/torproject/snowflake/services/RetroServiceGenerator.java @@ -21,7 +21,7 @@ public class RetroServiceGenerator { OkHttpClient.Builder httpClient = new OkHttpClient.Builder(); - + //TODO:Set Custom Time Out (Long Polling) if (BuildConfig.DEBUG) { HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(); interceptor.level(HttpLoggingInterceptor.Level.BODY);

1 0

[snowflake-mobile/master] Added delay to send/re-sending offer request
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit 19c1824a870623e4a475f3b647f954d89825b800 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jun 9 16:44:45 2020 +0530 Added delay to send/re-sending offer request --- app/src/main/java/org/torproject/snowflake/MyPersistentService.java | 6 +++--- 1 file changed, 3 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 f23fd0e..686156a 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -299,7 +299,9 @@ public class MyPersistentService extends Service { final GetOfferService getOfferService = RetroServiceGenerator.createService(GetOfferService.class); Observable<SDPOfferResponse> offer = getOfferService.getOffer(new OfferRequestBody("555")); //TODO:Randomly Generate SID. serviceDisposable = offer.subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()).subscribe(this::offerRequestSuccess, this::offerRequestFailure); + .delaySubscription(5000, TimeUnit.MILLISECONDS) //Delay of 5 seconds before sending request to avoid sending too many requests in case of a failure. + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(this::offerRequestSuccess, this::offerRequestFailure); } /** @@ -324,7 +326,6 @@ public class MyPersistentService extends Service { } else { updateNotification("No client match, retrying..."); Log.d(TAG, "requestSuccess: NO CLIENT MATCH"); - //TODO:Set a time out (delay) to resending offer. if (isServiceStarted) fetchOffer(); //Sending request for offer again. } @@ -338,7 +339,6 @@ public class MyPersistentService extends Service { public void offerRequestFailure(Throwable t) { updateNotification("Request failed, retrying..."); Log.d(TAG, "requestFailure: " + t.getMessage()); - //TODO:Set a time out (delay) to resending offer. if (isServiceStarted) fetchOffer(); //Sending request for offer again. }

1 0

[snowflake-mobile/master] Added update notification function
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit 9b5cb0c0b8840b41878fbd0b8006fce20ff8314e Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jun 9 15:28:30 2020 +0530 Added update notification function --- .../torproject/snowflake/MyPersistentService.java | 21 ++++++++++++++++++--- 1 file changed, 18 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 ddb418f..71545e6 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -1,8 +1,10 @@ package org.torproject.snowflake; import android.app.Notification; +import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; +import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.Build; @@ -112,6 +114,17 @@ public class MyPersistentService extends Service { } editor.apply(); } + /////////////// Notifications //////////////////////// + + /** + * Method that can be called to update the Notification + */ + private void updateNotification(String updateText) { + Notification notification = createPersistentNotification(true, updateText); //Create a new notification. + + NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + mNotificationManager.notify(ForegroundServiceConstants.DEF_NOTIFICATION_ID, notification); + } /** * Create a new persistent notification @@ -274,7 +287,7 @@ public class MyPersistentService extends Service { Log.d(TAG, "fetchOffer: Fetching offer from broker."); ///Retrofit call final GetOfferService getOfferService = RetroServiceGenerator.createService(GetOfferService.class); - Observable<SDPOfferResponse> offer = getOfferService.getOffer(new OfferRequestBody("555")); + Observable<SDPOfferResponse> offer = getOfferService.getOffer(new OfferRequestBody("555")); //TODO:Randomly Generate SID. serviceDisposable = offer.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()).subscribe(this::offerRequestSuccess, this::offerRequestFailure); } @@ -298,8 +311,9 @@ public class MyPersistentService extends Service { e.printStackTrace(); } } else { + updateNotification("No client match, retrying..."); Log.d(TAG, "requestSuccess: NO CLIENT MATCH"); - //TODO:Set a time out to resending offer. + //TODO:Set a time out (delay) to resending offer. if (isServiceStarted) fetchOffer(); //Sending request for offer again. } @@ -311,8 +325,9 @@ public class MyPersistentService extends Service { * @param t */ public void offerRequestFailure(Throwable t) { + updateNotification("Request failed, retrying..."); Log.d(TAG, "requestFailure: " + t.getMessage()); - //TODO:Set a time out to resending offer. + //TODO:Set a time out (delay) to resending offer. if (isServiceStarted) fetchOffer(); //Sending request for offer again. }

1 0