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

[tor/master] Make channel_get_addr_if_possible() take a const channel_t.
by dgoulet＠torproject.org 11 Jul '20

11 Jul '20

commit a81827d99ffdd36d87ca91637f022558783d44ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 08:41:00 2020 -0400 Make channel_get_addr_if_possible() take a const channel_t. (There is no reason that looking up the address of a channel should ever change it.) --- src/core/or/channel.c | 2 +- src/core/or/channel.h | 4 ++-- src/core/or/channeltls.c | 7 ++++--- src/test/test_dos.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/core/or/channel.c b/src/core/or/channel.c index a05554472..e21f5a12c 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -2849,7 +2849,7 @@ channel_get_canonical_remote_descr,(channel_t *chan)) * doesn't let us do this. */ MOCK_IMPL(int, -channel_get_addr_if_possible,(channel_t *chan, tor_addr_t *addr_out)) +channel_get_addr_if_possible,(const channel_t *chan, tor_addr_t *addr_out)) { tor_assert(chan); tor_assert(addr_out); diff --git a/src/core/or/channel.h b/src/core/or/channel.h index 4968c8714..79e5fea9c 100644 --- a/src/core/or/channel.h +++ b/src/core/or/channel.h @@ -335,7 +335,7 @@ struct channel_t { * provided tor_addr_t *, and return 1 if successful or 0 if no address * available. */ - int (*get_remote_addr)(channel_t *, tor_addr_t *); + int (*get_remote_addr)(const channel_t *, tor_addr_t *); int (*get_transport_name)(channel_t *chan, char **transport_out); #define GRD_FLAG_ORIGINAL 1 @@ -723,7 +723,7 @@ MOCK_DECL(void, channel_dump_statistics, (channel_t *chan, int severity)); void channel_dump_transport_statistics(channel_t *chan, int severity); const char * channel_get_actual_remote_descr(channel_t *chan); const char * channel_get_actual_remote_address(channel_t *chan); -MOCK_DECL(int, channel_get_addr_if_possible, (channel_t *chan, +MOCK_DECL(int, channel_get_addr_if_possible, (const channel_t *chan, tor_addr_t *addr_out)); MOCK_DECL(const char *, channel_get_canonical_remote_descr,(channel_t *chan)); int channel_has_queued_writes(channel_t *chan); diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 4db373097..ff4505acf 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -104,7 +104,8 @@ static const char * channel_tls_describe_transport_method(channel_t *chan); static void channel_tls_free_method(channel_t *chan); static double channel_tls_get_overhead_estimate_method(channel_t *chan); static int -channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out); +channel_tls_get_remote_addr_method(const channel_t *chan, + tor_addr_t *addr_out); static int channel_tls_get_transport_name_method(channel_t *chan, char **transport_out); static const char * @@ -515,10 +516,10 @@ channel_tls_get_overhead_estimate_method(channel_t *chan) * succeeds for this transport). */ static int -channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out) +channel_tls_get_remote_addr_method(const channel_t *chan, tor_addr_t *addr_out) { int rv = 0; - channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); + const channel_tls_t *tlschan = BASE_CHAN_TO_TLS((channel_t*) chan); tor_assert(tlschan); tor_assert(addr_out); diff --git a/src/test/test_dos.c b/src/test/test_dos.c index 527e5bbe7..3be09047d 100644 --- a/src/test/test_dos.c +++ b/src/test/test_dos.c @@ -108,7 +108,7 @@ test_dos_conn_creation(void *arg) /** Helper mock: Place a fake IP addr for this channel in <b>addr_out</b> */ static int -mock_channel_get_addr_if_possible(channel_t *chan, tor_addr_t *addr_out) +mock_channel_get_addr_if_possible(const channel_t *chan, tor_addr_t *addr_out) { (void)chan; tt_int_op(AF_INET,OP_EQ, tor_addr_parse(addr_out, "18.0.0.1"));

1 0

[tor/master] Changes file for ticket 33263
by dgoulet＠torproject.org 11 Jul '20

11 Jul '20

commit 1a4e475d5d86b0325914000889d5fd0dde42c2ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 10 09:25:11 2020 -0400 Changes file for ticket 33263 --- changes/ticket33263 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket33263 b/changes/ticket33263 new file mode 100644 index 000000000..ab5d9c969 --- /dev/null +++ b/changes/ticket33263 @@ -0,0 +1,4 @@ + o Minor features (statistics, ipv6): + - Relays now publish their IPv6 read and write statistics over time, + if statistics are enabled. + Closes ticket 33263.

1 0

[snowflake-mobile/master] Added custom toobar
by cohosh＠torproject.org 11 Jul '20

11 Jul '20

commit 2cdd98f866fa17149b081a0e0f4bc517423cb670 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 14:07:17 2020 +0530 Added custom toobar --- app/src/main/res/layout/activity_main.xml | 19 +++++++++++++++++++ app/src/main/res/values/styles.xml | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1c42128..0320e22 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,6 +6,25 @@ android:layout_height="match_parent" tools:context=".MainActivity"> + <androidx.appcompat.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/colorPrimary" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:layout_constraintTop_toTopOf="parent"> + + <TextView + android:id="@+id/toolbar_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:text="@string/app_name" + android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" + android:textColor="@android:color/white" + android:textSize="16sp" /> + </androidx.appcompat.widget.Toolbar> + <Button android:id="@+id/start_button" android:layout_width="wrap_content" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5885930..0eb88fe 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ <resources>  - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">  <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

1 0

[snowflake-mobile/master] Addedd preferences library to gradle
by cohosh＠torproject.org 11 Jul '20

11 Jul '20

commit aa8b875ea957fbf8b7273d9be7303580043f1da3 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 13:48:03 2020 +0530 Addedd preferences library to gradle --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 9580614..4d13970 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,6 +32,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.preference:preference:1.1.1' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

1 0

[snowflake-mobile/master] Addex settings XML file
by cohosh＠torproject.org 11 Jul '20

11 Jul '20

commit 2b1c5272d125dc9edf1b6103dca28ae298a4100f Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 13:57:27 2020 +0530 Addex settings XML file --- app/src/main/res/xml/app_settings.xml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml new file mode 100644 index 0000000..6685708 --- /dev/null +++ b/app/src/main/res/xml/app_settings.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> + + <PreferenceCategory android:title="Snowflake Settings"> + + <EditTextPreference + android:defaultValue="Default value" + android:key="edit_text_preference_1" + android:selectAllOnFocus="true" + android:singleLine="true" + android:title="Custom STUN Server" /> + <EditTextPreference + android:defaultValue="Default value" + android:key="edit_text_preference_1" + android:selectAllOnFocus="true" + android:singleLine="true" + android:title="Custom Broker URL" /> + <EditTextPreference + android:defaultValue="Default value" + android:key="edit_text_preference_2" + android:selectAllOnFocus="true" + android:singleLine="true" + android:title="Custom Relay URL" /> + </PreferenceCategory> +</PreferenceScreen> \ No newline at end of file

1 0

[snowflake-mobile/master] Addedd settings button
by cohosh＠torproject.org 11 Jul '20

11 Jul '20

commit 54434b020ade324ada26d073f9ab14e486bff402 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 14:41:50 2020 +0530 Addedd settings button --- app/src/main/res/drawable/ic_baseline_settings.xml | 5 ++++ app/src/main/res/layout/activity_main.xml | 35 +++++++++++++++------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/app/src/main/res/drawable/ic_baseline_settings.xml b/app/src/main/res/drawable/ic_baseline_settings.xml new file mode 100644 index 0000000..b240b83 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_settings.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#FFFFFF" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/> +</vector> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0320e22..916b433 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -9,26 +9,41 @@ <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="56dp" android:background="@color/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:layout_constraintTop_toTopOf="parent"> - <TextView - android:id="@+id/toolbar_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:text="@string/app_name" - android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" - android:textColor="@android:color/white" - android:textSize="16sp" /> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@+id/toolbar_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:text="@string/app_name" + android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" + android:textColor="@android:color/white" + android:textSize="16sp" /> + + <androidx.appcompat.widget.AppCompatButton + android:layout_width="25dp" + android:layout_height="25dp" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:layout_marginEnd="5dp" + android:background="@drawable/ic_baseline_settings" + android:foreground="?android:attr/selectableItemBackground" /> + </RelativeLayout> </androidx.appcompat.widget.Toolbar> <Button android:id="@+id/start_button" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:foreground="?android:attr/selectableItemBackground" android:text="Service Toggle" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent"

1 0

[snowflake-mobile/master] Fixed webscoket NullPointerException when there is no connection
by cohosh＠torproject.org 11 Jul '20

11 Jul '20

commit a5b26df61b802840766a68984c1fe639ef44a032 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 14:42:57 2020 +0530 Fixed webscoket NullPointerException when there is no connection --- app/src/main/java/org/torproject/snowflake/MyPersistentService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index c02276e..29fdad6 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -123,8 +123,8 @@ public class MyPersistentService extends Service { mainPeerConnection.close(); mainPeerConnection.dispose(); } - - webSocket.close(1000, "Normal closure"); + if (webSocket != null) + webSocket.close(1000, "Normal closure"); mNotificationManager.cancel(ForegroundServiceConstants.DEF_NOTIFICATION_ID); Log.d(TAG, "onDestroy: Service Destroyed"); super.onDestroy();

1 0

[snowflake-mobile/master] Added settings UI and handled button click
by cohosh＠torproject.org 11 Jul '20

11 Jul '20

commit 18f453de453981d3f5105d661efe40905aca5cc9 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 16:05:44 2020 +0530 Added settings UI and handled button click --- .../torproject/snowflake/AppSettingsFragment.java | 18 +++++++++ .../org/torproject/snowflake/MainActivity.java | 13 ++++++ .../org/torproject/snowflake/MainFragment.java | 1 - app/src/main/res/layout/activity_main.xml | 9 +++-- app/src/main/res/values/arrays.xml | 12 ++++++ app/src/main/res/xml/app_settings.xml | 47 ++++++++++++++++------ 6 files changed, 83 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/AppSettingsFragment.java b/app/src/main/java/org/torproject/snowflake/AppSettingsFragment.java new file mode 100644 index 0000000..33bc456 --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/AppSettingsFragment.java @@ -0,0 +1,18 @@ +package org.torproject.snowflake; + +import android.os.Bundle; + +import androidx.preference.PreferenceFragmentCompat; + +public class AppSettingsFragment extends PreferenceFragmentCompat { + + public static AppSettingsFragment newInstance() { + AppSettingsFragment fragment = new AppSettingsFragment(); + return fragment; + } + + @Override + public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { + setPreferencesFromResource(R.xml.app_settings, rootKey); + } +} diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 642fe21..a1eb34d 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -8,6 +8,8 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.os.Build; import android.os.Bundle; +import android.view.View; +import android.widget.Button; import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; @@ -21,12 +23,15 @@ import org.torproject.snowflake.interfaces.MainFragmentCallback; public class MainActivity extends AppCompatActivity implements MainFragmentCallback { private static final String TAG = "MainActivity"; private SharedPreferences sharedPreferences; + private Button settingsButton; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); setSupportActionBar(findViewById(R.id.toolbar)); + settingsButton = findViewById(R.id.settings_button); + sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); //Creating notification channel if app is being run for the first time @@ -36,6 +41,14 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb sharedPreferences.edit().putBoolean(getString(R.string.initial_run_boolean), false).apply(); } + settingsButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + //Starting Settings Activity. + startFragment(AppSettingsFragment.newInstance()); + } + }); + //Starting the MainFragment. startFragment(MainFragment.newInstance()); } diff --git a/app/src/main/java/org/torproject/snowflake/MainFragment.java b/app/src/main/java/org/torproject/snowflake/MainFragment.java index e30923b..520436c 100644 --- a/app/src/main/java/org/torproject/snowflake/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/MainFragment.java @@ -34,7 +34,6 @@ public class MainFragment extends Fragment { public static MainFragment newInstance() { MainFragment fragment = new MainFragment(); - Bundle bundle = new Bundle(); return fragment; } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c9f27a2..d095c62 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" @@ -29,6 +29,7 @@ android:textSize="16sp" /> <androidx.appcompat.widget.AppCompatButton + android:id="@+id/settings_button" android:layout_width="25dp" android:layout_height="25dp" android:layout_alignParentEnd="true" @@ -40,8 +41,8 @@ </androidx.appcompat.widget.Toolbar> <FrameLayout + android:id="@+id/fragment_container" 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 + android:layout_below="@id/toolbar" /> +</RelativeLayout> \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml new file mode 100644 index 0000000..6cf9ed4 --- /dev/null +++ b/app/src/main/res/values/arrays.xml @@ -0,0 +1,12 @@ +<resources> +  + <string-array name="reply_entries"> + <item>Reply</item> + <item>Reply to all</item> + </string-array> + + <string-array name="reply_values"> + <item>reply</item> + <item>reply_all</item> + </string-array> +</resources> \ No newline at end of file diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml index 6685708..ae85095 100644 --- a/app/src/main/res/xml/app_settings.xml +++ b/app/src/main/res/xml/app_settings.xml @@ -1,25 +1,48 @@ <?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - - <PreferenceCategory android:title="Snowflake Settings"> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <PreferenceCategory + android:title="Snowflake Settings" + app:iconSpaceReserved="false"> + <SwitchPreference + android:key="stun_switch" + android:title="Set STUN server" + app:iconSpaceReserved="false" /> <EditTextPreference - android:defaultValue="Default value" - android:key="edit_text_preference_1" + android:enabled="false" + android:key="stun_edit_text" android:selectAllOnFocus="true" android:singleLine="true" - android:title="Custom STUN Server" /> + android:summary="Using Default" + android:title="Set STUN server" + app:iconSpaceReserved="false" /> + + <SwitchPreference + android:key="broker_switch" + android:title="Set broker URL" + app:iconSpaceReserved="false" /> <EditTextPreference - android:defaultValue="Default value" - android:key="edit_text_preference_1" + android:enabled="false" + android:key="broker_switch_edit_text" android:selectAllOnFocus="true" android:singleLine="true" - android:title="Custom Broker URL" /> + android:summary="Using Default" + android:title="Set broker URL" + app:iconSpaceReserved="false" /> + + <SwitchPreference + android:key="relay_switch" + android:title="Set relay URL" + app:iconSpaceReserved="false" /> <EditTextPreference - android:defaultValue="Default value" - android:key="edit_text_preference_2" + android:enabled="false" + android:key="relay_switch_edit_text" android:selectAllOnFocus="true" android:singleLine="true" - android:title="Custom Relay URL" /> + android:summary="Using Default" + android:title="Custom relay URL" + app:iconSpaceReserved="false" /> + </PreferenceCategory> </PreferenceScreen> \ No newline at end of file

1 0

[snowflake-mobile/master] Moved main activity code in to MainFragment to make way for up comming settings fragment
by cohosh＠torproject.org 11 Jul '20

11 Jul '20

commit ec410a4b728cc5a3a4038ba46c32a7c6d66615c9 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 15:14:20 2020 +0530 Moved main activity code in to MainFragment to make way for up comming settings fragment --- app/build.gradle | 1 + .../org/torproject/snowflake/MainActivity.java | 20 ++----- .../org/torproject/snowflake/MainFragment.java | 68 ++++++++++++++++++++++ .../snowflake/interfaces/MainFragmentCallback.java | 6 ++ app/src/main/res/layout/activity_main.xml | 11 ---- app/src/main/res/layout/fragment_main_fragment.xml | 17 ++++++ app/src/main/res/values/strings.xml | 2 + 7 files changed, 99 insertions(+), 26 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4d13970..964695b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,6 +33,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 1ac43dd..d412944 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -8,16 +8,16 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.os.Build; import android.os.Bundle; -import android.widget.Button; import androidx.appcompat.app.AppCompatActivity; import org.torproject.snowflake.constants.ForegroundServiceConstants; +import org.torproject.snowflake.interfaces.MainFragmentCallback; /** * MainActivity is the main UI of the application. */ -public class MainActivity extends AppCompatActivity { +public class MainActivity extends AppCompatActivity implements MainFragmentCallback { private static final String TAG = "MainActivity"; private SharedPreferences sharedPreferences; @@ -25,7 +25,7 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - + setSupportActionBar(findViewById(R.id.toolbar)); sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); //Creating notification channel if app is being run for the first time @@ -34,16 +34,6 @@ public class MainActivity extends AppCompatActivity { //Setting initial run to false. sharedPreferences.edit().putBoolean(getString(R.string.initial_run_boolean), false).apply(); } - - Button startButton = findViewById(R.id.start_button); - startButton.setOnClickListener(v -> { - if (isServiceRunning()) //Toggling the service. - serviceToggle(ForegroundServiceConstants.ACTION_STOP); - else - serviceToggle(ForegroundServiceConstants.ACTION_START); - }); - if (BuildConfig.DEBUG) - startButton.performClick(); //To perform an automatic click in testing environment. } /** @@ -51,7 +41,7 @@ public class MainActivity extends AppCompatActivity { * * @param action An Action from ForegroundServiceConstants. */ - private void serviceToggle(String action) { + public void serviceToggle(String action) { Intent serviceIntent = new Intent(MainActivity.this, MyPersistentService.class); serviceIntent.setAction(action); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { @@ -66,7 +56,7 @@ public class MainActivity extends AppCompatActivity { * * @return boolean whether the service is running or not. */ - private boolean isServiceRunning() { + public boolean isServiceRunning() { return sharedPreferences.getBoolean(getString(R.string.is_service_running_bool), false); } diff --git a/app/src/main/java/org/torproject/snowflake/MainFragment.java b/app/src/main/java/org/torproject/snowflake/MainFragment.java new file mode 100644 index 0000000..f850277 --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/MainFragment.java @@ -0,0 +1,68 @@ +package org.torproject.snowflake; + +import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + +import org.torproject.snowflake.constants.ForegroundServiceConstants; +import org.torproject.snowflake.interfaces.MainFragmentCallback; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link MainFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class MainFragment extends Fragment { + MainFragmentCallback callback; + + public MainFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment. + * + * @return A new instance of fragment main_fragment. + */ + + public static MainFragment newInstance() { + MainFragment fragment = new MainFragment(); + Bundle bundle = new Bundle(); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + Button startButton = container.findViewById(R.id.start_button); + startButton.setOnClickListener(v -> { + if (callback.isServiceRunning()) //Toggling the service. + callback.serviceToggle(ForegroundServiceConstants.ACTION_STOP); + 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 inflater.inflate(R.layout.fragment_main_fragment, container, false); + } + + @Override + public void onAttach(@NonNull Context context) { + super.onAttach(context); + callback = (MainFragmentCallback) context; + } +} \ No newline at end of file diff --git a/app/src/main/java/org/torproject/snowflake/interfaces/MainFragmentCallback.java b/app/src/main/java/org/torproject/snowflake/interfaces/MainFragmentCallback.java new file mode 100644 index 0000000..08e2d99 --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/interfaces/MainFragmentCallback.java @@ -0,0 +1,6 @@ +package org.torproject.snowflake.interfaces; + +public interface MainFragmentCallback { + boolean isServiceRunning(); + void serviceToggle(String action); +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 916b433..abc7268 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -38,15 +38,4 @@ android:foreground="?android:attr/selectableItemBackground" /> </RelativeLayout> </androidx.appcompat.widget.Toolbar> - - <Button - android:id="@+id/start_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:foreground="?android:attr/selectableItemBackground" - android:text="Service Toggle" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> </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 new file mode 100644 index 0000000..7523126 --- /dev/null +++ b/app/src/main/res/layout/fragment_main_fragment.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout 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" + tools:context=".MainFragment"> + + + <Button + android:id="@+id/start_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:foreground="?android:attr/selectableItemBackground" + android:text="Service Toggle" /> + +</FrameLayout> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d737520..c26d83e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,4 +5,6 @@ <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] Handled back press from fragments
by cohosh＠torproject.org 11 Jul '20

11 Jul '20

commit a9548589575a7bc6dc443df09189e5eef27b4c1c Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jun 28 16:19:23 2020 +0530 Handled back press from fragments --- .../java/org/torproject/snowflake/MainActivity.java | 20 ++++++++++++++++++++ .../snowflake/constants/FragmentConstants.java | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index a1eb34d..7bafaf4 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -8,6 +8,7 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.os.Build; import android.os.Bundle; +import android.util.Log; import android.view.View; import android.widget.Button; @@ -15,6 +16,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.fragment.app.Fragment; import org.torproject.snowflake.constants.ForegroundServiceConstants; +import org.torproject.snowflake.constants.FragmentConstants; import org.torproject.snowflake.interfaces.MainFragmentCallback; /** @@ -22,6 +24,7 @@ import org.torproject.snowflake.interfaces.MainFragmentCallback; */ public class MainActivity extends AppCompatActivity implements MainFragmentCallback { private static final String TAG = "MainActivity"; + int currentFragment; private SharedPreferences sharedPreferences; private Button settingsButton; @@ -59,6 +62,14 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb * @param fragment New Fragment that is to be placed in the container. */ private void startFragment(Fragment fragment) { + if (fragment instanceof MainFragment) { + currentFragment = FragmentConstants.MAIN_FRAGMENT; + } else { + currentFragment = FragmentConstants.APP_SETTINGS_FRAGMENT; + } + + Log.d(TAG, "startFragment: " + currentFragment); + getSupportFragmentManager() .beginTransaction() .replace(R.id.fragment_container, @@ -107,4 +118,13 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb notificationManager.createNotificationChannel(channel); } } + + @Override + public void onBackPressed() { + //If the back is pressed on AppSettingsFragment take it back to MainFragment. + if(currentFragment == FragmentConstants.APP_SETTINGS_FRAGMENT) + startFragment(MainFragment.newInstance()); + else + super.onBackPressed(); + } } diff --git a/app/src/main/java/org/torproject/snowflake/constants/FragmentConstants.java b/app/src/main/java/org/torproject/snowflake/constants/FragmentConstants.java new file mode 100644 index 0000000..00942b8 --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/constants/FragmentConstants.java @@ -0,0 +1,6 @@ +package org.torproject.snowflake.constants; + +public class FragmentConstants { + public static final int MAIN_FRAGMENT = 0; + public static final int APP_SETTINGS_FRAGMENT = 1; +}

1 0