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

[snowflake-mobile/master] Started MainFragment from MainActivity
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit 272ca20f2ea2d7f6869da4e4a6f8a66b2f97c8bb Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 15:26:42 2020 +0530 Started MainFragment from MainActivity --- .../main/java/org/torproject/snowflake/MainActivity.java | 16 ++++++++++++++++ .../main/java/org/torproject/snowflake/MainFragment.java | 5 +++-- app/src/main/res/layout/activity_main.xml | 6 ++++++ app/src/main/res/layout/fragment_main_fragment.xml | 4 ++-- 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index d412944..642fe21 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -10,6 +10,7 @@ import android.os.Build; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; import org.torproject.snowflake.constants.ForegroundServiceConstants; import org.torproject.snowflake.interfaces.MainFragmentCallback; @@ -34,6 +35,21 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb //Setting initial run to false. sharedPreferences.edit().putBoolean(getString(R.string.initial_run_boolean), false).apply(); } + + //Starting the MainFragment. + startFragment(MainFragment.newInstance()); + } + + /** + * Used to replace the fragment in the "fragment_container" + * + * @param fragment New Fragment that is to be placed in the container. + */ + private void startFragment(Fragment fragment) { + getSupportFragmentManager() + .beginTransaction() + .replace(R.id.fragment_container, + fragment).commit(); } /** diff --git a/app/src/main/java/org/torproject/snowflake/MainFragment.java b/app/src/main/java/org/torproject/snowflake/MainFragment.java index f850277..e30923b 100644 --- a/app/src/main/java/org/torproject/snowflake/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/MainFragment.java @@ -46,7 +46,8 @@ public class MainFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - Button startButton = container.findViewById(R.id.start_button); + View rootView = inflater.inflate(R.layout.fragment_main_fragment, container, false); + Button startButton = rootView.findViewById(R.id.start_button); startButton.setOnClickListener(v -> { if (callback.isServiceRunning()) //Toggling the service. callback.serviceToggle(ForegroundServiceConstants.ACTION_STOP); @@ -57,7 +58,7 @@ public class MainFragment extends Fragment { startButton.performClick(); //To perform an automatic click in testing environment. // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_main_fragment, container, false); + return rootView; } @Override diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index abc7268..c9f27a2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -38,4 +38,10 @@ android:foreground="?android:attr/selectableItemBackground" /> </RelativeLayout> </androidx.appcompat.widget.Toolbar> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/fragment_container" + app:layout_constraintTop_toBottomOf="@+id/toolbar" /> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_fragment.xml b/app/src/main/res/layout/fragment_main_fragment.xml index 7523126..6e9c225 100644 --- a/app/src/main/res/layout/fragment_main_fragment.xml +++ b/app/src/main/res/layout/fragment_main_fragment.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -14,4 +14,4 @@ android:foreground="?android:attr/selectableItemBackground" android:text="Service Toggle" /> -</FrameLayout> \ No newline at end of file +</RelativeLayout> \ No newline at end of file

1 0

[snowflake-mobile/master] Fixed the bug of EditText deactivated when app restarts
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit 5078bbb0325b25c01c58bbf7a282f6218fd9ddb1 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 18:46:14 2020 +0530 Fixed the bug of EditText deactivated when app restarts --- .../snowflake/constants/SettingsConstants.java | 24 ++++++++++++++++++++++ .../snowflake/fragments/AppSettingsFragment.java | 20 ++++++++++++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/constants/SettingsConstants.java b/app/src/main/java/org/torproject/snowflake/constants/SettingsConstants.java new file mode 100644 index 0000000..6b6026e --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/constants/SettingsConstants.java @@ -0,0 +1,24 @@ +package org.torproject.snowflake.constants; + +import java.util.HashMap; +import java.util.Map; + +public class SettingsConstants { + //Switches + public static final String STUN_SWITCH = "stun_switch"; + public static final String BROKER_SWITCH = "broker_switch"; + public static final String RELAY_SWITCH = "relay_switch"; + + //Edit Texts + public static final String STUN_ET = "stun_edit_text"; + public static final String BROKER_ET = "broker_edit_text"; + public static final String RELAY_ET = "relay_edit_text"; + + public static Map<String, String> getSettingMap(){ + return new HashMap<String, String>(){{ + put(STUN_SWITCH, STUN_ET); + put(BROKER_SWITCH, BROKER_ET); + put(RELAY_SWITCH, RELAY_ET); + }}; + } +} diff --git a/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java index 526f0c8..87c2df9 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java @@ -8,6 +8,10 @@ import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import org.torproject.snowflake.R; +import org.torproject.snowflake.constants.SettingsConstants; + +import java.util.Iterator; +import java.util.Map; public class AppSettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -21,7 +25,19 @@ public class AppSettingsFragment extends PreferenceFragmentCompat implements Sha @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { setPreferencesFromResource(R.xml.app_settings, rootKey); - getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this); + SharedPreferences sharedPreferences = getPreferenceManager().getSharedPreferences(); + sharedPreferences.registerOnSharedPreferenceChangeListener(this); + + //When the fragment is started we have to check and set the EditTexts' to active. + Map<String, String> settingMap = SettingsConstants.getSettingMap(); + for(String button: settingMap.keySet()){ + String editT = settingMap.get(button); + + boolean isEnabled = sharedPreferences.getBoolean(button, false); + findPreference(editT).setEnabled(isEnabled); + findPreference(editT).setSummary( + sharedPreferences.getString(editT, "Default Value")); + } } @Override @@ -49,7 +65,7 @@ public class AppSettingsFragment extends PreferenceFragmentCompat implements Sha //It's an Edit Text String editValue = sharedPreferences.getString(key, ""); if (!editValue.equals("")) - findPreference(key).setSummary(editValue); //Setting Edit text to edited value + findPreference(key).setSummary(editValue.trim()); //Setting Edit text to edited value else findPreference(key).setSummary("Using Default"); //Setting Edit text to Default because user left it empty. }

1 0

[snowflake-mobile/master] Moved files in to fragments package
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit bb53d2eb3f12e09e62ffa0de7c0d3c04387ee703 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 17:46:17 2020 +0530 Moved files in to fragments package --- app/src/main/java/org/torproject/snowflake/MainActivity.java | 2 ++ .../org/torproject/snowflake/{ => fragments}/AppSettingsFragment.java | 4 +++- .../java/org/torproject/snowflake/{ => fragments}/MainFragment.java | 4 +++- app/src/main/res/layout/fragment_main_fragment.xml | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 7bafaf4..1f8070f 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -17,6 +17,8 @@ import androidx.fragment.app.Fragment; import org.torproject.snowflake.constants.ForegroundServiceConstants; import org.torproject.snowflake.constants.FragmentConstants; +import org.torproject.snowflake.fragments.AppSettingsFragment; +import org.torproject.snowflake.fragments.MainFragment; import org.torproject.snowflake.interfaces.MainFragmentCallback; /** diff --git a/app/src/main/java/org/torproject/snowflake/AppSettingsFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java similarity index 97% rename from app/src/main/java/org/torproject/snowflake/AppSettingsFragment.java rename to app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java index bfc0631..526f0c8 100644 --- a/app/src/main/java/org/torproject/snowflake/AppSettingsFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java @@ -1,4 +1,4 @@ -package org.torproject.snowflake; +package org.torproject.snowflake.fragments; import android.content.SharedPreferences; import android.os.Bundle; @@ -7,6 +7,8 @@ import android.util.Log; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; +import org.torproject.snowflake.R; + public class AppSettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { private static final String TAG = "AppSettingsFragment"; diff --git a/app/src/main/java/org/torproject/snowflake/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java similarity index 94% rename from app/src/main/java/org/torproject/snowflake/MainFragment.java rename to app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index 520436c..0b11c22 100644 --- a/app/src/main/java/org/torproject/snowflake/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -1,4 +1,4 @@ -package org.torproject.snowflake; +package org.torproject.snowflake.fragments; import android.content.Context; import android.os.Bundle; @@ -10,6 +10,8 @@ import android.widget.Button; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; +import org.torproject.snowflake.BuildConfig; +import org.torproject.snowflake.R; import org.torproject.snowflake.constants.ForegroundServiceConstants; import org.torproject.snowflake.interfaces.MainFragmentCallback; diff --git a/app/src/main/res/layout/fragment_main_fragment.xml b/app/src/main/res/layout/fragment_main_fragment.xml index 6e9c225..bd6a855 100644 --- a/app/src/main/res/layout/fragment_main_fragment.xml +++ b/app/src/main/res/layout/fragment_main_fragment.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainFragment"> + tools:context=".fragments.MainFragment"> <Button

1 0

[snowflake-mobile/master] Bug fix: Settings showing as using default servers on app restart even tho they are not
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit 76a349a7e9b5f4948a8342c5f44fd3c7d809a562 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 21:37:18 2020 +0530 Bug fix: Settings showing as using default servers on app restart even tho they are not --- .../snowflake/constants/SettingsConstants.java | 6 ++++-- .../snowflake/fragments/AppSettingsFragment.java | 23 ++++++++++++---------- app/src/main/res/xml/app_settings.xml | 4 ---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/constants/SettingsConstants.java b/app/src/main/java/org/torproject/snowflake/constants/SettingsConstants.java index 6b6026e..95b3ede 100644 --- a/app/src/main/java/org/torproject/snowflake/constants/SettingsConstants.java +++ b/app/src/main/java/org/torproject/snowflake/constants/SettingsConstants.java @@ -14,8 +14,10 @@ public class SettingsConstants { public static final String BROKER_ET = "broker_edit_text"; public static final String RELAY_ET = "relay_edit_text"; - public static Map<String, String> getSettingMap(){ - return new HashMap<String, String>(){{ + public static final String DEFAULT = "Using Default"; + + public static Map<String, String> getSettingMap() { + return new HashMap<String, String>() {{ put(STUN_SWITCH, STUN_ET); put(BROKER_SWITCH, BROKER_ET); put(RELAY_SWITCH, RELAY_ET); diff --git a/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java index 87c2df9..409625a 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/AppSettingsFragment.java @@ -10,7 +10,6 @@ import androidx.preference.PreferenceFragmentCompat; import org.torproject.snowflake.R; import org.torproject.snowflake.constants.SettingsConstants; -import java.util.Iterator; import java.util.Map; public class AppSettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -30,13 +29,17 @@ public class AppSettingsFragment extends PreferenceFragmentCompat implements Sha //When the fragment is started we have to check and set the EditTexts' to active. Map<String, String> settingMap = SettingsConstants.getSettingMap(); - for(String button: settingMap.keySet()){ - String editT = settingMap.get(button); + for (String settingSwitch : settingMap.keySet()) { + String editT = settingMap.get(settingSwitch); - boolean isEnabled = sharedPreferences.getBoolean(button, false); - findPreference(editT).setEnabled(isEnabled); - findPreference(editT).setSummary( - sharedPreferences.getString(editT, "Default Value")); + boolean isEnabled = sharedPreferences.getBoolean(settingSwitch, false); + if (!isEnabled) + findPreference(settingSwitch).setSummary(SettingsConstants.DEFAULT); + + Preference editText = findPreference(editT); + editText.setEnabled(isEnabled); + editText.setSummary( + sharedPreferences.getString(editT, SettingsConstants.DEFAULT)); } } @@ -57,9 +60,9 @@ public class AppSettingsFragment extends PreferenceFragmentCompat implements Sha if (!previousValue.equals("")) editTextPreference.setSummary(previousValue); //When Switch is turned on set the summary to previously set Value. else - editTextPreference.setSummary("Using Default"); //If there is no previous value, then using null. + editTextPreference.setSummary(SettingsConstants.DEFAULT); //If there is no previous value, then using null. } else { - findPreference(key).setSummary("Using Default"); //Default is shown when switch is off. + findPreference(key).setSummary(SettingsConstants.DEFAULT); //Default is shown when switch is off. } } else { //It's an Edit Text @@ -67,7 +70,7 @@ public class AppSettingsFragment extends PreferenceFragmentCompat implements Sha if (!editValue.equals("")) findPreference(key).setSummary(editValue.trim()); //Setting Edit text to edited value else - findPreference(key).setSummary("Using Default"); //Setting Edit text to Default because user left it empty. + findPreference(key).setSummary(SettingsConstants.DEFAULT); //Setting Edit text to Default because user left it empty. } } diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml index a8d08d8..d3a110e 100644 --- a/app/src/main/res/xml/app_settings.xml +++ b/app/src/main/res/xml/app_settings.xml @@ -7,7 +7,6 @@ app:iconSpaceReserved="false"> <SwitchPreference android:key="stun_switch" - android:summary="Using Default" android:title="Set STUN server" app:iconSpaceReserved="false" /> <EditTextPreference @@ -21,7 +20,6 @@ <SwitchPreference android:key="broker_switch" - android:summary="Using Default" android:title="Set broker URL" app:iconSpaceReserved="false" /> <EditTextPreference @@ -35,7 +33,6 @@ <SwitchPreference android:key="relay_switch" - android:summary="Using Default" android:title="Set relay URL" app:iconSpaceReserved="false" /> <EditTextPreference @@ -43,7 +40,6 @@ android:key="relay_edit_text" android:selectAllOnFocus="true" android:singleLine="true" - android:summary="Using Default" android:title="Custom relay URL" app:iconSpaceReserved="false" />

1 0

[snowflake-mobile/master] Removed IDE auto-generated fragment string resource
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit 8ab616c27d5b64617e601780b01058bb6b25e224 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jul 7 20:23:43 2020 +0530 Removed IDE auto-generated fragment string resource --- app/src/main/res/values/strings.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c26d83e..d737520 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,6 +5,4 @@ <string name="not_channel_desc">This Channel should not be muted. The Android system will consider Snowflake not import and will kill the service if it\'s muted.</string> <string name="initial_run_boolean">initial_run</string> <string name="not_channel_name">Snowflake Service</string> -  - <string name="hello_blank_fragment">Hello blank fragment</string> </resources>

1 0

[snowflake-mobile/master] Finally implemented the custom URLs in to the service
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit edaa544f29cbead7a8fc976fd958bccd57deedf9 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 19:32:14 2020 +0530 Finally implemented the custom URLs in to the service --- app/src/main/AndroidManifest.xml | 1 + .../torproject/snowflake/GlobalApplication.java | 30 ++++++++++++++++++++++ .../torproject/snowflake/MyPersistentService.java | 5 +++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6b366fb..67e8537 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,6 +9,7 @@ <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <application + android:name=".GlobalApplication" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" diff --git a/app/src/main/java/org/torproject/snowflake/GlobalApplication.java b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java index 8ef1f16..b38393f 100644 --- a/app/src/main/java/org/torproject/snowflake/GlobalApplication.java +++ b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java @@ -1,22 +1,45 @@ package org.torproject.snowflake; import android.app.Application; +import android.content.SharedPreferences; +import android.util.Log; + +import org.torproject.snowflake.constants.SettingsConstants; import java.util.HashMap; import java.util.Map; +import static android.content.ContentValues.TAG; +import static androidx.preference.PreferenceManager.getDefaultSharedPreferences; + 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. private final static String WEBSOCKET_URL = "wss://snowflake.freehaven.net:443"; + private static SharedPreferences sharedPreferences; public static String getBrokerUrl() { + //Checking to see if the switch is turned on. + if (sharedPreferences.getBoolean(SettingsConstants.BROKER_SWITCH, false)) + //Send the custom Broker URL, if the key is not found send default. + return sharedPreferences.getString(SettingsConstants.BROKER_ET, BROKER_URL); return BROKER_URL; } public static String getWebSocketUrl() { + //Checking to see if the switch is turned on. + if (sharedPreferences.getBoolean(SettingsConstants.RELAY_SWITCH, false)) + //Send the custom Socket URL, if the key is not found send default. + return sharedPreferences.getString(SettingsConstants.RELAY_ET, WEBSOCKET_URL); return WEBSOCKET_URL; } + public static String getSTUN() { + //Checking to see if the switch is turned on. + if (sharedPreferences.getBoolean(SettingsConstants.STUN_SWITCH, false)) + return sharedPreferences.getString(SettingsConstants.STUN_ET, null); //Send the custom STUN if it's turned on. + return null; + } + public static Map<String, String> getHeadersMap() { HashMap<String, String> map = new HashMap<>(); map.put("Content-type", "application/json"); @@ -24,4 +47,11 @@ public class GlobalApplication extends Application { map.put("Host", getBrokerUrl().replace("http://", "")); return map; } + + @Override + public void onCreate() { + Log.d(TAG, "onCreate: "); + super.onCreate(); + sharedPreferences = getDefaultSharedPreferences(this); + } } diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 29fdad6..fe85bea 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -276,7 +276,10 @@ public class MyPersistentService extends Service { private PeerConnection createPeerConnection(PeerConnectionFactory factory) { Log.d(TAG, "createPeerConnection: Creating a new peer connection"); List<PeerConnection.IceServer> iceServers = new LinkedList<>(); -// iceServers.add(PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer()); To Add custom ICE servers. + if (GlobalApplication.getSTUN() != null) { + iceServers.add(PeerConnection.IceServer.builder(GlobalApplication.getSTUN()) + .createIceServer()); //Adding custom ICE server. + } PeerConnection.RTCConfiguration rtcConfiguration = new PeerConnection.RTCConfiguration(iceServers); PeerConnection.Observer pcObserver = new MyPeerConnectionObserver(TAG, new PeerConnectionObserverCallback() {

1 0

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

10 Jul '20

commit e4ec88fb8bd15f1a9a266769924eded8c5302836 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jul 7 21:40:08 2020 +0530 Handled Invalid relay URL error --- .../torproject/snowflake/MyPersistentService.java | 101 +++++++++++++-------- 1 file changed, 61 insertions(+), 40 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index fe85bea..c5baf30 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -317,10 +317,9 @@ public class MyPersistentService extends Service { if (STATE == DataChannel.State.OPEN) { updateNotification("Connection Established. Serving one client."); - startWebSocket(); } else if (STATE == DataChannel.State.CLOSED) { updateNotification("Connection is closed. Resending offer..."); - closeConnectionAndResend(); + closeConnections(true); } } }); @@ -340,6 +339,7 @@ public class MyPersistentService extends Service { public void onCreateSuccess(SessionDescription sessionDescription) { mainPeerConnection.setLocalDescription(new SimpleSdpObserver("Local"), sessionDescription); //Wait till ICE Gathering/ Trickling is finished to send the answer. + startWebSocket(); //While waiting, opening the WebSocket connection. } @Override @@ -441,7 +441,7 @@ public class MyPersistentService extends Service { private void answerResponseSuccess(AnsResponse ansResponse) { if (ansResponse.getStatus().equals(BrokerConstants.CLIENT_GONE)) { Log.d(TAG, "answerResponseSuccess: Client Gone"); - closeConnectionAndResend(); + closeConnections(true); } else { Log.d(TAG, "answerResponseSuccess: Sending Success"); } @@ -459,12 +459,25 @@ public class MyPersistentService extends Service { /** * Closing the connection and resending the request to get SDP. + * + * @param resend If the service should resend the request or not. */ - private void closeConnectionAndResend() { - Log.d(TAG, "closeConnectionAndResend: Closing connection and resending request."); - //Closing both to avoid memory leak. - mainDataChannel.close(); - mainPeerConnection.close(); + private void closeConnections(boolean resend) { + if (!resend) { //If you don't want to resend + Log.d(TAG, "closeConnection: Closing connection"); + //Closing both to avoid memory leak. + if (mainDataChannel != null) + mainDataChannel.close(); + if (mainPeerConnection != null) + mainPeerConnection.close(); + if (webSocket != null && isWebSocketOpen){ + webSocket.close(1000, "Normal closure"); + isWebSocketOpen = false; + } + + return; + } + Log.d(TAG, "closeConnection: Connections closed. Resending request for offer..."); isConnectionAlive = false; } @@ -472,38 +485,46 @@ public class MyPersistentService extends Service { private void startWebSocket() { OkHttpClient client = new OkHttpClient(); - webSocket = client.newWebSocket(new Request.Builder().url(GlobalApplication.getWebSocketUrl()).build() - , 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; - } - }); + 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; + } + }); + } catch (IllegalArgumentException e) { + updateNotification("Invalid Relay URL entered. 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); + } client.dispatcher().executorService().shutdown(); }

1 0

[snowflake-mobile/master] Removed button auto-click in testing env, to avoid confusion
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit 531630460a4cb5d504d2afbc561e81bda06bc06f Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jul 7 20:25:07 2020 +0530 Removed button auto-click in testing env, to avoid confusion --- app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java index 0b11c22..0ac2407 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -55,8 +55,6 @@ public class MainFragment extends Fragment { else callback.serviceToggle(ForegroundServiceConstants.ACTION_START); }); - if (BuildConfig.DEBUG) - startButton.performClick(); //To perform an automatic click in testing environment. // Inflate the layout for this fragment return rootView;

1 0

[snowflake-mobile/master] Disposed all threads when we don't want to resend request
by cohosh＠torproject.org 10 Jul '20

10 Jul '20

commit b83fc18a490f151c6c67217019a8828f44519d86 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Tue Jul 7 22:16:44 2020 +0530 Disposed all threads when we don't want to resend request --- app/src/main/java/org/torproject/snowflake/MyPersistentService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 62f1d3f..07fc37c 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -491,6 +491,8 @@ public class MyPersistentService extends Service { webSocket.close(1000, "Normal closure"); isWebSocketOpen = false; } + if (compositeDisposable != null) + compositeDisposable.dispose(); //Disposing all the threads. Including network calls. return; }

1 0

[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