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

[tor/master] Fix segfault and logic error in remove_duplicate_orports()
by asn＠torproject.org 30 Jul '20

30 Jul '20

commit fc5fe094b1a330c30c951492d2401a8de1acfa97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 24 16:41:31 2020 -0400 Fix segfault and logic error in remove_duplicate_orports() This function tried to modify an array in place, but did it in a pretty confusing and complicated way. I've revised it to follow a much more straightforward approach. Fixes bug #40065. --- src/feature/relay/relay_config.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index 9273a7cef0..fc934b7879 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -186,8 +186,14 @@ describe_relay_port(const port_cfg_t *port) static void remove_duplicate_orports(smartlist_t *ports) { + /* First we'll decide what to remove, then we'll remove it. */ + bool *removing = tor_calloc(smartlist_len(ports), sizeof(bool)); + for (int i = 0; i < smartlist_len(ports); ++i) { - port_cfg_t *current = smartlist_get(ports, i); + const port_cfg_t *current = smartlist_get(ports, i); + if (removing[i]) { + continue; + } /* Skip non ORPorts. */ if (current->type != CONN_TYPE_OR_LISTENER) { @@ -195,26 +201,40 @@ remove_duplicate_orports(smartlist_t *ports) } for (int j = 0; j < smartlist_len(ports); ++j) { - port_cfg_t *next = smartlist_get(ports, j); + const port_cfg_t *next = smartlist_get(ports, j); /* Avoid comparing the same object. */ if (current == next) { continue; } + if (removing[j]) { + continue; + } /* Same address family and same port number, we have a match. */ if (!current->explicit_addr && next->explicit_addr && tor_addr_family(&current->addr) == tor_addr_family(&next->addr) && current->port == next->port) { /* Remove current because next is explicitly set. */ - smartlist_del_keeporder(ports, i--); + removing[i] = true; char *next_str = tor_strdup(describe_relay_port(next)); log_warn(LD_CONFIG, "Configuration port %s superseded by %s", describe_relay_port(current), next_str); tor_free(next_str); - port_cfg_free(current); } } } + + /* Iterate over array in reverse order to keep indices valid. */ + for (int i = smartlist_len(ports)-1; i >= 0; --i) { + tor_assert(i < smartlist_len(ports)); + if (removing[i]) { + port_cfg_t *current = smartlist_get(ports, i); + smartlist_del_keeporder(ports, i); + port_cfg_free(current); + } + } + + tor_free(removing); } /** Given a list of <b>port_cfg_t</b> in <b>ports</b>, check them for internal

1 0

[tor/master] Merge branch 'tor-gitlab/mr/84'
by asn＠torproject.org 30 Jul '20

30 Jul '20

commit 155e0dee49ad041707b8bc498d8fb6a82103800b Merge: 9164d7c75e 219edc9ab1 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jul 30 19:49:25 2020 +0300 Merge branch 'tor-gitlab/mr/84' src/feature/relay/relay_config.c | 51 ++++++++++++++++++++++++++++++++++------ src/feature/relay/relay_config.h | 1 + src/test/test_config.c | 34 +++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 7 deletions(-)

1 0

[tor/master] Write unittest for #40065.
by asn＠torproject.org 30 Jul '20

30 Jul '20

commit 2bb9acca73f37a1d63485afa6bf1e52e37b333b9 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jul 29 12:39:05 2020 +0300 Write unittest for #40065. Make the unit test pass by including an explicit IPv6 port and an implicit IPv4 port. See comments for more details. --- src/feature/relay/relay_config.c | 2 +- src/feature/relay/relay_config.h | 1 + src/test/test_config.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index fc934b7879..711fbd14e5 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -183,7 +183,7 @@ describe_relay_port(const port_cfg_t *port) * * The following is O(n^2) but it is done at bootstrap or config reload and * the list is not very long usually. */ -static void +STATIC void remove_duplicate_orports(smartlist_t *ports) { /* First we'll decide what to remove, then we'll remove it. */ diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h index c70c322d88..671399ac0a 100644 --- a/src/feature/relay/relay_config.h +++ b/src/feature/relay/relay_config.h @@ -84,6 +84,7 @@ int options_act_relay_dir(const struct or_options_t *old_options); #ifdef RELAY_CONFIG_PRIVATE +STATIC void remove_duplicate_orports(struct smartlist_t *ports); STATIC int check_bridge_distribution_setting(const char *bd); STATIC int have_enough_mem_for_dircache(const struct or_options_t *options, size_t total_mem, char **msg); diff --git a/src/test/test_config.c b/src/test/test_config.c index 9eadfeed33..c116a1bbe9 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -6497,6 +6497,39 @@ test_config_getinfo_config_names(void *arg) tor_free(answer); } +static void +test_config_duplicate_orports(void *arg) +{ + (void)arg; + + config_line_t *config_port = NULL; + smartlist_t *ports = smartlist_new(); + + // Pretend that the user has specified an implicit 0.0.0.0:9050, an implicit + // [::]:9050, and an explicit on [::1]:9050. + config_line_append(&config_port, "ORPort", "9050"); // two implicit entries. + config_line_append(&config_port, "ORPort", "[::1]:9050"); + + // Parse IPv4, then IPv6. + port_parse_config(ports, config_port, "OR", CONN_TYPE_OR_LISTENER, "0.0.0.0", + 0, CL_PORT_SERVER_OPTIONS); + port_parse_config(ports, config_port, "OR", CONN_TYPE_OR_LISTENER, "[::]", + 0, CL_PORT_SERVER_OPTIONS); + + // There should be three ports at this point. + tt_int_op(smartlist_len(ports), OP_EQ, 3); + + remove_duplicate_orports(ports); + + // The explicit IPv6 port should have replaced the implicit IPv6 port. + tt_int_op(smartlist_len(ports), OP_EQ, 2); + + done: + SMARTLIST_FOREACH(ports,port_cfg_t *,pf,port_cfg_free(pf)); + smartlist_free(ports); + config_free_lines(config_port); +} + #ifndef COCCI #define CONFIG_TEST(name, flags) \ { #name, test_config_ ## name, flags, NULL, NULL } @@ -6562,5 +6595,6 @@ struct testcase_t config_tests[] = { CONFIG_TEST(extended_fmt, 0), CONFIG_TEST(kvline_parse, 0), CONFIG_TEST(getinfo_config_names, 0), + CONFIG_TEST(duplicate_orports, 0), END_OF_TESTCASES };

1 0

[tor/master] Handle ORPort auto when logging about removed orports.
by asn＠torproject.org 30 Jul '20

30 Jul '20

commit 219edc9ab1d78e5739ed4454d50952af56ff3f43 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 13:57:43 2020 -0400 Handle ORPort auto when logging about removed orports. Closes #40075 --- src/feature/relay/relay_config.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index 711fbd14e5..d3f904d286 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -133,6 +133,22 @@ port_warn_nonlocal_ext_orports(const smartlist_t *ports, const char *portname) } SMARTLIST_FOREACH_END(port); } +/** + * Return a static buffer describing the port number in @a port, which may + * CFG_AUTO_PORT. + **/ +static const char * +describe_portnum(int port) +{ + static char buf[16]; + if (port == CFG_AUTO_PORT) { + return "auto"; + } else { + tor_snprintf(buf, sizeof(buf), "%d", port); + return buf; + } +} + /** Return a static buffer containing the human readable logging string that * describes the given port object. */ static const char * @@ -166,8 +182,9 @@ describe_relay_port(const port_cfg_t *port) addr = ""; } - tor_snprintf(buf, sizeof(buf), "%sPort %s%s%d", - type, addr, (strlen(addr) > 0) ? ":" : "", port->port); + tor_snprintf(buf, sizeof(buf), "%sPort %s%s%s", + type, addr, (strlen(addr) > 0) ? ":" : "", + describe_portnum(port->port)); return buf; }

1 0

[snowflake-mobile/master] Remove fix screen rotation flag
by cohosh＠torproject.org 30 Jul '20

30 Jul '20

commit 6f37537d8f9a668c716977875b70f3db15a63d9d Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Jul 30 13:50:38 2020 +0530 Remove fix screen rotation flag --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2ea8221..95e5a3a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ <activity android:name=".MainActivity" - android:screenOrientation="portrait"> + android:configChanges="orientation|screenSize|screenLayout"> <intent-filter> <action android:name="android.intent.action.MAIN" />

1 0

[snowflake-mobile/master] Removed View from MainActivityPresenter
by cohosh＠torproject.org 30 Jul '20

30 Jul '20

commit 0c6c12bfd5c258e659d78d11b7ec6e91baca5280 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Jul 30 13:48:19 2020 +0530 Removed View from MainActivityPresenter --- .../org/torproject/snowflake/presenters/MainActivityPresenter.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java b/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java index 471fc74..fd91839 100644 --- a/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java +++ b/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java @@ -80,11 +80,4 @@ public class MainActivityPresenter implements MainActivityMVPContract.Presenter public void checkDate() { model.checkDateAsync(); } - - /** - * View for the MainActivity - */ - public interface View { - void updateCountInFragment(int i); - } }

1 0

[snowflake-mobile/master] Changed Presenter as Class to Interface in MainActivity
by cohosh＠torproject.org 30 Jul '20

30 Jul '20

commit 27483cec3f7a30e7849c07f579133a57b7341d23 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Jul 30 20:46:35 2020 +0530 Changed Presenter as Class to Interface in MainActivity --- app/src/main/java/org/torproject/snowflake/MainActivity.java | 2 +- .../main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java | 2 ++ 2 files changed, 3 insertions(+), 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 4a2eb33..4664ae5 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -27,7 +27,7 @@ import org.torproject.snowflake.presenters.MainActivityPresenter; public class MainActivity extends AppCompatActivity implements MainFragmentCallback, MainActivityMVPContract.View { private static final String TAG = "MainActivity"; int currentFragment; - MainActivityPresenter presenter; + MainActivityMVPContract.Presenter presenter; //Indicates if model finished checking the date and reset served count if need be. boolean isCheckDateFinished; private Button settingsButton; diff --git a/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java b/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java index 4c76496..1bda683 100644 --- a/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java +++ b/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java @@ -29,6 +29,8 @@ public interface MainActivityMVPContract { boolean isServiceRunning(); + void detach(); + void updateServedCount(int count); void checkDate();

1 0

[snowflake-mobile/master] Reformated AppPreferenceConstants to AppPreferenceKeys
by cohosh＠torproject.org 30 Jul '20

30 Jul '20

commit 63ba408df3179e3e22082cf03d52b0e070118626 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Thu Jul 30 20:48:14 2020 +0530 Reformated AppPreferenceConstants to AppPreferenceKeys --- .../org/torproject/snowflake/MyPersistentService.java | 12 ++++++------ ...PreferenceConstants.java => AppPreferenceKeys.java} | 2 +- .../torproject/snowflake/models/MainActivityModel.java | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 2444255..c23a084 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -16,7 +16,7 @@ import androidx.annotation.Nullable; import org.jetbrains.annotations.NotNull; import org.json.JSONException; -import org.torproject.snowflake.constants.AppPreferenceConstants; +import org.torproject.snowflake.constants.AppPreferenceKeys; import org.torproject.snowflake.constants.BrokerConstants; import org.torproject.snowflake.constants.ForegroundServiceConstants; import org.torproject.snowflake.exceptions.EmptySIDException; @@ -81,7 +81,7 @@ public class MyPersistentService extends Service { public int onStartCommand(Intent intent, int flags, int startId) { Log.d(TAG, "onStartCommand: executed with startId: " + startId); sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); - isServiceStarted = sharedPreferences.getBoolean(AppPreferenceConstants.IS_SERVICE_RUNNING_KEY, false); + isServiceStarted = sharedPreferences.getBoolean(AppPreferenceKeys.IS_SERVICE_RUNNING_KEY, false); if (intent != null) { if (intent.getAction().equals(ForegroundServiceConstants.ACTION_START)) @@ -133,10 +133,10 @@ public class MyPersistentService extends Service { if (setState == ForegroundServiceConstants.SERVICE_RUNNING) { isServiceStarted = true; - editor.putBoolean(AppPreferenceConstants.IS_SERVICE_RUNNING_KEY, true); + editor.putBoolean(AppPreferenceKeys.IS_SERVICE_RUNNING_KEY, true); } else { isServiceStarted = false; - editor.putBoolean(AppPreferenceConstants.IS_SERVICE_RUNNING_KEY, false); + editor.putBoolean(AppPreferenceKeys.IS_SERVICE_RUNNING_KEY, false); } editor.apply(); } @@ -147,8 +147,8 @@ public class MyPersistentService extends Service { private void updateServedCount() { SharedPreferences sp = GlobalApplication.getAppPreferences(); sp.edit() - .putInt(AppPreferenceConstants.USER_SERVED_KEY, - sp.getInt(AppPreferenceConstants.USER_SERVED_KEY, 0) + 1) + .putInt(AppPreferenceKeys.USER_SERVED_KEY, + sp.getInt(AppPreferenceKeys.USER_SERVED_KEY, 0) + 1) .apply(); } diff --git a/app/src/main/java/org/torproject/snowflake/constants/AppPreferenceConstants.java b/app/src/main/java/org/torproject/snowflake/constants/AppPreferenceKeys.java similarity index 88% rename from app/src/main/java/org/torproject/snowflake/constants/AppPreferenceConstants.java rename to app/src/main/java/org/torproject/snowflake/constants/AppPreferenceKeys.java index 58400a4..835304e 100644 --- a/app/src/main/java/org/torproject/snowflake/constants/AppPreferenceConstants.java +++ b/app/src/main/java/org/torproject/snowflake/constants/AppPreferenceKeys.java @@ -1,6 +1,6 @@ package org.torproject.snowflake.constants; -public class AppPreferenceConstants { +public class AppPreferenceKeys { public static final String USER_SERVED_KEY = "users_served"; public static final String DATE_KEY = "date"; public static final String INITIAL_RUN_KEY = "initial_run"; diff --git a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java index 01cdb14..66c5f4c 100644 --- a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java +++ b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java @@ -4,7 +4,7 @@ import android.content.SharedPreferences; import android.util.Log; import org.torproject.snowflake.GlobalApplication; -import org.torproject.snowflake.constants.AppPreferenceConstants; +import org.torproject.snowflake.constants.AppPreferenceKeys; import org.torproject.snowflake.mvp.MainActivityMVPContract; import java.text.ParseException; @@ -44,19 +44,19 @@ public class MainActivityModel implements MainActivityMVPContract.Model { } public int getServedCount() { - return sharedPreferences.getInt(AppPreferenceConstants.USER_SERVED_KEY, 0); + return sharedPreferences.getInt(AppPreferenceKeys.USER_SERVED_KEY, 0); } public boolean getInitialRunBool() { - return sharedPreferences.getBoolean(AppPreferenceConstants.INITIAL_RUN_KEY, true); + return sharedPreferences.getBoolean(AppPreferenceKeys.INITIAL_RUN_KEY, true); } public void setInitialRunBool(boolean val) { - sharedPreferences.edit().putBoolean(AppPreferenceConstants.INITIAL_RUN_KEY, val).apply(); + sharedPreferences.edit().putBoolean(AppPreferenceKeys.INITIAL_RUN_KEY, val).apply(); } public boolean isServiceRunning() { - return sharedPreferences.getBoolean(AppPreferenceConstants.IS_SERVICE_RUNNING_KEY, false); + return sharedPreferences.getBoolean(AppPreferenceKeys.IS_SERVICE_RUNNING_KEY, false); } /** @@ -71,7 +71,7 @@ public class MainActivityModel implements MainActivityMVPContract.Model { listener = (prefs, key) -> { Log.d(TAG, "setListenerForCount: Listener: Key = " + key); - if (key.equals(AppPreferenceConstants.USER_SERVED_KEY)) { + if (key.equals(AppPreferenceKeys.USER_SERVED_KEY)) { servedCount = sharedPreferences.getInt(key, 0); if (presenter != null) presenter.updateServedCount(servedCount); @@ -82,7 +82,7 @@ public class MainActivityModel implements MainActivityMVPContract.Model { } public String getDate() { - return sharedPreferences.getString(AppPreferenceConstants.DATE_KEY, ""); + return sharedPreferences.getString(AppPreferenceKeys.DATE_KEY, ""); } /** @@ -90,8 +90,8 @@ public class MainActivityModel implements MainActivityMVPContract.Model { */ public void setDateAndServed(String date, int value) { SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putString(AppPreferenceConstants.DATE_KEY, date); - editor.putInt(AppPreferenceConstants.USER_SERVED_KEY, value); + editor.putString(AppPreferenceKeys.DATE_KEY, date); + editor.putInt(AppPreferenceKeys.USER_SERVED_KEY, value); editor.apply(); }

1 0

[snowflake-mobile/master] Moved SharedPreferences to constants to increase cohesion in presenter
by cohosh＠torproject.org 30 Jul '20

30 Jul '20

commit 3c049a864187e1fc7740f0bcd5947a9e5f354d22 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jul 25 18:40:14 2020 +0530 Moved SharedPreferences to constants to increase cohesion in presenter --- .../torproject/snowflake/MyPersistentService.java | 11 +++++----- .../constants/AppPreferenceConstants.java | 8 ++++++++ .../snowflake/models/MainActivityModel.java | 24 +++++++++++----------- .../presenters/MainActivityPresenter.java | 11 +++++----- .../main/res/values/strings_preference_keys.xml | 4 ---- 5 files changed, 32 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index c8c2304..2444255 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -16,6 +16,7 @@ import androidx.annotation.Nullable; import org.jetbrains.annotations.NotNull; import org.json.JSONException; +import org.torproject.snowflake.constants.AppPreferenceConstants; import org.torproject.snowflake.constants.BrokerConstants; import org.torproject.snowflake.constants.ForegroundServiceConstants; import org.torproject.snowflake.exceptions.EmptySIDException; @@ -80,7 +81,7 @@ public class MyPersistentService extends Service { public int onStartCommand(Intent intent, int flags, int startId) { Log.d(TAG, "onStartCommand: executed with startId: " + startId); sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); - isServiceStarted = sharedPreferences.getBoolean(getString(R.string.is_service_running_bool_key), false); + isServiceStarted = sharedPreferences.getBoolean(AppPreferenceConstants.IS_SERVICE_RUNNING_KEY, false); if (intent != null) { if (intent.getAction().equals(ForegroundServiceConstants.ACTION_START)) @@ -132,10 +133,10 @@ public class MyPersistentService extends Service { if (setState == ForegroundServiceConstants.SERVICE_RUNNING) { isServiceStarted = true; - editor.putBoolean(getString(R.string.is_service_running_bool_key), true); + editor.putBoolean(AppPreferenceConstants.IS_SERVICE_RUNNING_KEY, true); } else { isServiceStarted = false; - editor.putBoolean(getString(R.string.is_service_running_bool_key), false); + editor.putBoolean(AppPreferenceConstants.IS_SERVICE_RUNNING_KEY, false); } editor.apply(); } @@ -146,8 +147,8 @@ public class MyPersistentService extends Service { private void updateServedCount() { SharedPreferences sp = GlobalApplication.getAppPreferences(); sp.edit() - .putInt(getString(R.string.users_served_key), - sp.getInt(getString(R.string.users_served_key), 0) + 1) + .putInt(AppPreferenceConstants.USER_SERVED_KEY, + sp.getInt(AppPreferenceConstants.USER_SERVED_KEY, 0) + 1) .apply(); } diff --git a/app/src/main/java/org/torproject/snowflake/constants/AppPreferenceConstants.java b/app/src/main/java/org/torproject/snowflake/constants/AppPreferenceConstants.java new file mode 100644 index 0000000..58400a4 --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/constants/AppPreferenceConstants.java @@ -0,0 +1,8 @@ +package org.torproject.snowflake.constants; + +public class AppPreferenceConstants { + public static final String USER_SERVED_KEY = "users_served"; + public static final String DATE_KEY = "date"; + public static final String INITIAL_RUN_KEY = "initial_run"; + public static final String IS_SERVICE_RUNNING_KEY = "is_service_running"; +} diff --git a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java index 7aaf0e5..4354913 100644 --- a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java +++ b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java @@ -4,6 +4,7 @@ import android.content.SharedPreferences; import android.util.Log; import org.torproject.snowflake.GlobalApplication; +import org.torproject.snowflake.constants.AppPreferenceConstants; import org.torproject.snowflake.presenters.MainActivityPresenter; import java.text.ParseException; @@ -13,7 +14,6 @@ import java.util.Date; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.core.Single; -import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; /** @@ -55,8 +55,8 @@ public class MainActivityModel { sharedPreferences.edit().putBoolean(key, val).apply(); } - public boolean isServiceRunning(String key) { - return sharedPreferences.getBoolean(key, false); + public boolean isServiceRunning() { + return sharedPreferences.getBoolean(AppPreferenceConstants.IS_SERVICE_RUNNING_KEY, false); } /** @@ -71,7 +71,7 @@ public class MainActivityModel { listener = (prefs, key) -> { Log.d(TAG, "setListenerForCount: Listener: Key = " + key); - if (key.equals("users_served")) { + if (key.equals(AppPreferenceConstants.USER_SERVED_KEY)) { servedCount = sharedPreferences.getInt(key, 0); if (presenter != null) presenter.updateServedCount(servedCount); @@ -81,17 +81,17 @@ public class MainActivityModel { sharedPreferences.registerOnSharedPreferenceChangeListener(listener); } - public String getDate(String dateKey) { - return sharedPreferences.getString(dateKey, ""); + public String getDate() { + return sharedPreferences.getString(AppPreferenceConstants.DATE_KEY, ""); } /** * Setting the users served date and value. */ - public void setDateAndServed(String dateKey, String valueKey, String date, int value) { + public void setDateAndServed(String date, int value) { SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putString(dateKey, date); - editor.putInt(valueKey, value); + editor.putString(AppPreferenceConstants.DATE_KEY, date); + editor.putInt(AppPreferenceConstants.USER_SERVED_KEY, value); editor.apply(); } @@ -111,7 +111,7 @@ public class MainActivityModel { //No value for key. Set the date value to current date and users served to 0. if (stringRecordedDate.equals("")) { - setDateAndServed("date", "users_served", stringCurrentDate, 0); + setDateAndServed(stringCurrentDate, 0); } else { //Check if the current system date is greater than recorded date, if so reset the "served" flag. Date recordedDate = simpleDateFormat.parse(stringRecordedDate); @@ -125,7 +125,7 @@ public class MainActivityModel { return true; } else { //Current date is bigger than recorded date. Reset the values. i.e comparision > 0 - setDateAndServed("date", "users_served", simpleDateFormat.format(currentDate), 0); + setDateAndServed(simpleDateFormat.format(currentDate), 0); } } @@ -146,7 +146,7 @@ public class MainActivityModel { .observeOn(AndroidSchedulers.mainThread()) .subscribe((status) -> { //Runs on main thread //By this point the servedCount must be reset or left as is after checking the dates. - presenter.updateServedCount(getServedCount("users_served")); + presenter.updateServedCount(getServedCount(AppPreferenceConstants.USER_SERVED_KEY)); setListenerForCount(); }); } diff --git a/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java b/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java index 1958622..d2c0734 100644 --- a/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java +++ b/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java @@ -4,6 +4,7 @@ import android.util.Log; import org.torproject.snowflake.MainActivity; import org.torproject.snowflake.R; +import org.torproject.snowflake.constants.AppPreferenceConstants; import org.torproject.snowflake.models.MainActivityModel; /** @@ -32,7 +33,7 @@ public class MainActivityPresenter { public int getServedCount() { Log.d(TAG, "getServedCount: "); if (view != null) { - return model.getServedCount(((MainActivity) view).getString(R.string.users_served_key)); + return model.getServedCount(AppPreferenceConstants.USER_SERVED_KEY); } return 0; } @@ -40,7 +41,7 @@ public class MainActivityPresenter { public boolean getInitialRunBoolean() { Log.d(TAG, "getInitialRunBoolean: "); if (view != null) { - return model.getInitialRunBool(((MainActivity) view).getString(R.string.initial_run_boolean_key)); + return model.getInitialRunBool(AppPreferenceConstants.INITIAL_RUN_KEY); } return false; } @@ -53,7 +54,7 @@ public class MainActivityPresenter { public void setInitialRunBoolean(boolean val) { Log.d(TAG, "setInitialRunBoolean: "); if (view != null) { - model.setInitialRunBool(((MainActivity) view).getString(R.string.initial_run_boolean_key), val); + model.setInitialRunBool(AppPreferenceConstants.INITIAL_RUN_KEY, val); } } @@ -65,7 +66,7 @@ public class MainActivityPresenter { public boolean isServiceRunning() { Log.d(TAG, "isServiceRunning: "); if (view != null) { - return model.isServiceRunning(((MainActivity) view).getString(R.string.is_service_running_bool_key)); + return model.isServiceRunning(); } return true; } @@ -81,7 +82,7 @@ public class MainActivityPresenter { * Getting the served date. */ public String getDate() { - return model.getDate("date"); + return model.getDate(); } public void checkDate() { diff --git a/app/src/main/res/values/strings_preference_keys.xml b/app/src/main/res/values/strings_preference_keys.xml index 2727405..44d2ee0 100644 --- a/app/src/main/res/values/strings_preference_keys.xml +++ b/app/src/main/res/values/strings_preference_keys.xml @@ -1,8 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="sharedpreference_file">org.torproject.snowflake.snowflake_preferences</string> - <string name="users_served_key">users_served</string> - <string name="served_date_key">date</string> - <string name="initial_run_boolean_key">initial_run</string> - <string name="is_service_running_bool_key">is_service_running</string> </resources> \ No newline at end of file

1 0

[snowflake-mobile/master] Changed MainActivityMVP to MainActivityMVP contract
by cohosh＠torproject.org 30 Jul '20

30 Jul '20

commit 3ae099643500469bb948870ba9ebcbc89e03fe84 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sun Jul 26 16:47:24 2020 +0530 Changed MainActivityMVP to MainActivityMVP contract --- app/src/main/java/org/torproject/snowflake/MainActivity.java | 4 ++-- .../org/torproject/snowflake/models/MainActivityModel.java | 10 +++++----- .../mvp/{MainActivityMVP.java => MainActivityMVPContract.java} | 2 +- .../torproject/snowflake/presenters/MainActivityPresenter.java | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index d888ffd..4a2eb33 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -18,13 +18,13 @@ import org.torproject.snowflake.constants.FragmentConstants; import org.torproject.snowflake.fragments.AppSettingsFragment; import org.torproject.snowflake.fragments.MainFragment; import org.torproject.snowflake.interfaces.MainFragmentCallback; -import org.torproject.snowflake.mvp.MainActivityMVP; +import org.torproject.snowflake.mvp.MainActivityMVPContract; import org.torproject.snowflake.presenters.MainActivityPresenter; /** * MainActivity is the main UI of the application. */ -public class MainActivity extends AppCompatActivity implements MainFragmentCallback, MainActivityMVP.View { +public class MainActivity extends AppCompatActivity implements MainFragmentCallback, MainActivityMVPContract.View { private static final String TAG = "MainActivity"; int currentFragment; MainActivityPresenter presenter; diff --git a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java index b04de57..01cdb14 100644 --- a/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java +++ b/app/src/main/java/org/torproject/snowflake/models/MainActivityModel.java @@ -5,7 +5,7 @@ import android.util.Log; import org.torproject.snowflake.GlobalApplication; import org.torproject.snowflake.constants.AppPreferenceConstants; -import org.torproject.snowflake.mvp.MainActivityMVP; +import org.torproject.snowflake.mvp.MainActivityMVPContract; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -19,22 +19,22 @@ import io.reactivex.rxjava3.schedulers.Schedulers; /** * Model for MainActivity to handle network calls, Shared preferences. */ -public class MainActivityModel implements MainActivityMVP.Model { +public class MainActivityModel implements MainActivityMVPContract.Model { private static final String TAG = "MainActivityModel"; private static MainActivityModel instance = null; private SharedPreferences sharedPreferences; - private MainActivityMVP.Presenter presenter; + private MainActivityMVPContract.Presenter presenter; private int servedCount; private SharedPreferences.OnSharedPreferenceChangeListener listener; - private MainActivityModel(MainActivityMVP.Presenter presenter) { + private MainActivityModel(MainActivityMVPContract.Presenter presenter) { sharedPreferences = GlobalApplication.getAppPreferences(); this.presenter = presenter; servedCount = 0; } - public static MainActivityModel getInstance(MainActivityMVP.Presenter presenter) { + public static MainActivityModel getInstance(MainActivityMVPContract.Presenter presenter) { if (instance == null) { synchronized (MainActivityModel.class) { instance = new MainActivityModel(presenter); diff --git a/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVP.java b/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java similarity index 93% rename from app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVP.java rename to app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java index 0ea2068..4c76496 100644 --- a/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVP.java +++ b/app/src/main/java/org/torproject/snowflake/mvp/MainActivityMVPContract.java @@ -3,7 +3,7 @@ package org.torproject.snowflake.mvp; /** * MVP contract Interface */ -public interface MainActivityMVP { +public interface MainActivityMVPContract { interface View { void updateCountInFragment(int i); } diff --git a/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java b/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java index dee48f8..471fc74 100644 --- a/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java +++ b/app/src/main/java/org/torproject/snowflake/presenters/MainActivityPresenter.java @@ -3,17 +3,17 @@ package org.torproject.snowflake.presenters; import android.util.Log; import org.torproject.snowflake.models.MainActivityModel; -import org.torproject.snowflake.mvp.MainActivityMVP; +import org.torproject.snowflake.mvp.MainActivityMVPContract; /** * Presenter for MainActivity. */ -public class MainActivityPresenter implements MainActivityMVP.Presenter { +public class MainActivityPresenter implements MainActivityMVPContract.Presenter { private static final String TAG = "MainActivityPresenter"; - MainActivityMVP.View view; - MainActivityMVP.Model model; + MainActivityMVPContract.View view; + MainActivityMVPContract.Model model; - public MainActivityPresenter(MainActivityMVP.View view) { + public MainActivityPresenter(MainActivityMVPContract.View view) { //Attaching this.view = view; model = MainActivityModel.getInstance(this);

1 0