tor-commits June 2020

tor-commits@lists.torproject.org

17 participants
1326 discussions

[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] 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] 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 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] Removed hardcoded headers from service and added them dynamically
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit f45d55bea8b71051c1941fd6d9d605818eecc09c Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Jun 17 13:25:48 2020 +0530 Removed hardcoded headers from service and added them dynamically --- .../main/java/org/torproject/snowflake/GlobalApplication.java | 11 +++++++++++ .../java/org/torproject/snowflake/MyPersistentService.java | 6 +++--- .../org/torproject/snowflake/services/GetOfferService.java | 8 ++++++-- .../org/torproject/snowflake/services/SendAnswerService.java | 8 ++++++-- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/GlobalApplication.java b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java index 288733d..42e3b7f 100644 --- a/app/src/main/java/org/torproject/snowflake/GlobalApplication.java +++ b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java @@ -2,10 +2,21 @@ package org.torproject.snowflake; import android.app.Application; +import java.util.HashMap; +import java.util.Map; + 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; } + + public static Map<String, String> getHeadersMap() { + HashMap<String, String> map = new HashMap<>(); + map.put("Content-type", "application/json"); + //http or https shouldn't be part of header or els broker will throw error. + map.put("Host", getBrokerUrl().replace("http://", "")); + return map; + } } diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 60cd0e0..91550d6 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -286,7 +286,7 @@ 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){ + if (STATE == DataChannel.State.OPEN) { updateNotification("Connection Established. Serving one client."); } } @@ -326,7 +326,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")); //TODO:Randomly Generate SID. + Observable<SDPOfferResponse> offer = getOfferService.getOffer(GlobalApplication.getHeadersMap(), new OfferRequestBody("555")); //TODO:Randomly Generate SID. serviceDisposable = offer.subscribeOn(Schedulers.io()) .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()) @@ -381,7 +381,7 @@ public class MyPersistentService extends Service { 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); + Observable<AnsResponse> response = service.sendAnswer(GlobalApplication.getHeadersMap(), body); serviceDisposable = response.subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()).subscribe(this::answerResponseSuccess, this::answerResponseFailure); } diff --git a/app/src/main/java/org/torproject/snowflake/services/GetOfferService.java b/app/src/main/java/org/torproject/snowflake/services/GetOfferService.java index 317bcc5..40a7cb6 100644 --- a/app/src/main/java/org/torproject/snowflake/services/GetOfferService.java +++ b/app/src/main/java/org/torproject/snowflake/services/GetOfferService.java @@ -3,13 +3,17 @@ package org.torproject.snowflake.services; import org.torproject.snowflake.pojo.OfferRequestBody; import org.torproject.snowflake.pojo.SDPOfferResponse; +import java.util.Map; + import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Body; +import retrofit2.http.HeaderMap; import retrofit2.http.Headers; import retrofit2.http.POST; public interface GetOfferService { @POST("proxy") - @Headers({"Content-type: application/json", "Host: 10.0.2.2:8080"}) - Observable<SDPOfferResponse> getOffer(@Body OfferRequestBody body); + Observable<SDPOfferResponse> getOffer( + @HeaderMap Map<String, String> headersMap, + @Body OfferRequestBody body); } diff --git a/app/src/main/java/org/torproject/snowflake/services/SendAnswerService.java b/app/src/main/java/org/torproject/snowflake/services/SendAnswerService.java index 8d2f153..af14726 100644 --- a/app/src/main/java/org/torproject/snowflake/services/SendAnswerService.java +++ b/app/src/main/java/org/torproject/snowflake/services/SendAnswerService.java @@ -3,13 +3,17 @@ package org.torproject.snowflake.services; import org.torproject.snowflake.pojo.AnsResponse; import org.torproject.snowflake.pojo.AnswerBody; +import java.util.Map; + import io.reactivex.rxjava3.core.Observable; import retrofit2.http.Body; +import retrofit2.http.HeaderMap; import retrofit2.http.Headers; import retrofit2.http.POST; public interface SendAnswerService { @POST("answer") - @Headers({"Content-type: application/json", "Host: 10.0.2.2:8080"}) - Observable<AnsResponse> sendAnswer(@Body AnswerBody body); + Observable<AnsResponse> sendAnswer( + @HeaderMap Map<String, String> headersMap, + @Body AnswerBody body); }

1 0

[snowflake-mobile/master] Changed fetchOffer into a loop to avoid spaghetti code
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit 2ddfebe2a80a24675a7a1320fc5562737fe5c5e5 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Jun 17 22:59:20 2020 +0530 Changed fetchOffer into a loop to avoid spaghetti code --- .../torproject/snowflake/MyPersistentService.java | 59 ++++++++++++++-------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 0273d05..8b20772 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.core.Observable; -import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.disposables.CompositeDisposable; import io.reactivex.rxjava3.schedulers.Schedulers; /** @@ -55,9 +55,9 @@ public class MyPersistentService extends Service { private SharedPreferences sharedPreferences; private boolean isServiceStarted; private PowerManager.WakeLock wakeLock; - private Disposable serviceDisposable; + private CompositeDisposable compositeDisposable; private NotificationManager mNotificationManager; - + private boolean isConnectionAlive; @Nullable @Override @@ -91,6 +91,8 @@ public class MyPersistentService extends Service { Log.d(TAG, "onCreate: Service Created"); mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + isConnectionAlive = false; + compositeDisposable = new CompositeDisposable(); sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); //Assigning the shared preferences Notification notification = createPersistentNotification(false, null); startForeground(ForegroundServiceConstants.DEF_NOTIFICATION_ID, notification); @@ -99,8 +101,8 @@ public class MyPersistentService extends Service { @Override public void onDestroy() { sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_STOPPED); - if (serviceDisposable != null) - serviceDisposable.dispose(); //Stopping the network request if it's running. + if (compositeDisposable != null) + compositeDisposable.dispose(); //Disposing all the threads. Including network calls. if (mainDataChannel != null) { mainDataChannel.close(); } @@ -220,9 +222,18 @@ public class MyPersistentService extends Service { * Initializing and starting WebRTC connection. */ private void startWebRTCConnection() { + Log.d(TAG, "startWebRTCConnection: Starting Connection."); initializePeerConnectionFactory(); //Android Specific, you can Ignore. mainPeerConnection = createPeerConnection(factory); //Creating New Peer Connection. - fetchOffer(); + compositeDisposable.add( + //First argument is initialDelay, Second argument is the time after which it has to repeat. + Observable.interval(1, 5, TimeUnit.SECONDS) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(aLong -> { + fetchOffer(); //This runs on main thread. + }) + ); } /** @@ -323,14 +334,19 @@ public class MyPersistentService extends Service { * Sending post request to get offer from the broker. */ private void fetchOffer() { - Log.d(TAG, "fetchOffer: Fetching offer from broker."); - ///Retrofit call - final GetOfferService getOfferService = RetroServiceGenerator.createService(GetOfferService.class); - Observable<SDPOfferResponse> offer = getOfferService.getOffer(GlobalApplication.getHeadersMap(), new OfferRequestBody("555")); //TODO:Randomly Generate SID. - serviceDisposable = offer.subscribeOn(Schedulers.io()) - .delaySubscription(5, TimeUnit.SECONDS) //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); + //Fetch offer only when the connection is not alive/active and only when the service is on. + if (isServiceStarted && !isConnectionAlive) { + 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); + Observable<SDPOfferResponse> offer = getOfferService.getOffer(GlobalApplication.getHeadersMap(), new OfferRequestBody("555")); //TODO:Randomly Generate SID. + compositeDisposable.add( + offer.subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(this::offerRequestSuccess, this::offerRequestFailure) + ); + } } /** @@ -355,8 +371,7 @@ public class MyPersistentService extends Service { } else { updateNotification("No client match, retrying..."); Log.d(TAG, "requestSuccess: NO CLIENT MATCH"); - if (isServiceStarted) - fetchOffer(); //Sending request for offer again. + isConnectionAlive = false; } } @@ -368,8 +383,7 @@ public class MyPersistentService extends Service { public void offerRequestFailure(Throwable t) { updateNotification("Request failed, retrying..."); Log.d(TAG, "requestFailure: " + t.getMessage()); - if (isServiceStarted) - fetchOffer(); //Sending request for offer again. + isConnectionAlive = false; } /** @@ -382,8 +396,10 @@ public class MyPersistentService extends Service { 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(GlobalApplication.getHeadersMap(), body); - serviceDisposable = response.subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()).subscribe(this::answerResponseSuccess, this::answerResponseFailure); + compositeDisposable.add( + response.subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()).subscribe(this::answerResponseSuccess, this::answerResponseFailure) + ); } /** @@ -407,6 +423,7 @@ public class MyPersistentService extends Service { */ private void answerResponseFailure(Throwable throwable) { Log.e(TAG, "answerResponseFailure: " + throwable.getMessage()); + isConnectionAlive = false; } /** @@ -417,6 +434,6 @@ public class MyPersistentService extends Service { //Closing both to avoid memory leak. mainDataChannel.close(); mainPeerConnection.close(); - fetchOffer(); //Sending request for offer again. + isConnectionAlive = false; } }

1 0

[snowflake-mobile/master] Changed time in Milliseconds to Seconds
by cohosh＠torproject.org 18 Jun '20

18 Jun '20

commit 95cc69443e74926c8b5a59b3d9a5dea40e763d27 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Wed Jun 17 13:29:32 2020 +0530 Changed time in Milliseconds to Seconds --- 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 91550d6..0273d05 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -328,7 +328,7 @@ public class MyPersistentService extends Service { final GetOfferService getOfferService = RetroServiceGenerator.createService(GetOfferService.class); Observable<SDPOfferResponse> offer = getOfferService.getOffer(GlobalApplication.getHeadersMap(), new OfferRequestBody("555")); //TODO:Randomly Generate SID. serviceDisposable = offer.subscribeOn(Schedulers.io()) - .delaySubscription(5000, TimeUnit.MILLISECONDS) //Delay of 5 seconds before sending request to avoid sending too many requests in case of a failure. + .delaySubscription(5, TimeUnit.SECONDS) //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); }

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

[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] 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2020