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

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 20 Jul '20

20 Jul '20

commit c077881540298de2a127ad7d0d5ed21bd2a0516a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 20 15:47:00 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+de.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+de.po b/contents+de.po index 051f1d4bb2..ef1d43a27f 100644 --- a/contents+de.po +++ b/contents+de.po @@ -2592,7 +2592,7 @@ msgstr "12. Öffne das Abfrageergebnis von \"The Tor Project\" und installiere e #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) msgid "#### The Tor Project website" -msgstr "" +msgstr "#### Die Tor Project Website" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body) @@ -2601,6 +2601,10 @@ msgid "" "apk from the [Tor Project " "website](https://www.torproject.org/download/#android)." msgstr "" +"Du kannst den Tor Browser für Android auch bekommen, indem du die apk-Datei " +"von der Website des [Tor Project] " +"(https://www.torproject.org/download/#android) herunterlädst und " +"installierst." #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

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

20 Jul '20

commit 012367398e8cf064536051cdca451fb71bec255f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 20 15:46:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- en_GB.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en_GB.po b/en_GB.po index 990913331f..1bf6443d6f 100644 --- a/en_GB.po +++ b/en_GB.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 00:35+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-07-20 15:38+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

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

20 Jul '20

commit 1b24f76f0b0895c47fc86c4e318ac4a7fea6197f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 20 15:45:50 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- en_GB.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/en_GB.po b/en_GB.po index 3ed6287f09..f1e47fa674 100644 --- a/en_GB.po +++ b/en_GB.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-06-29 00:35+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2020-07-20 15:38+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -405,7 +405,7 @@ msgstr "Offline" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329 msgid "_Unsafe Browser" -msgstr "" +msgstr "_Unsafe Browser" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338 msgid "Enabled" @@ -413,7 +413,7 @@ msgstr "Enabled" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340 msgid "Disabled (default)" -msgstr "" +msgstr "Disabled (default)" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:391 msgid "On (default)" @@ -658,11 +658,11 @@ msgstr "Keep files stored in the `Persistent' directory" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "Settings on the Welcome Screen" -msgstr "" +msgstr "Settings on the Welcome Screen" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "Language, administration password, and additional settings" -msgstr "" +msgstr "Language, administration password, and additional settings" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Browser Bookmarks" @@ -845,7 +845,7 @@ msgstr "The drive Tails is running from cannot be found. Maybe you used the 'tor #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:42 msgid "Import Failed" -msgstr "" +msgstr "Import Failed" #. Translators: Don't translate {path} or {error}, #. they are placeholders and will be replaced. @@ -854,13 +854,13 @@ msgstr "" msgid "" "Failed to import keys from {path}:\n" "{error}" -msgstr "" +msgstr "Failed to import keys from {path}:\n{error}" #: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53 msgid "Key Imported" msgid_plural "Keys Imported" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Key Imported" +msgstr[1] "Keys Imported" #. Translators: Don't translate {uids}, it's a placeholder and #. will be replaced. @@ -868,8 +868,8 @@ msgstr[1] "" #, python-brace-format msgid "Imported a key for {uids}" msgid_plural "Imported keys for {uids}" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Imported a key for {uids}" +msgstr[1] "Imported keys for {uids}" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Lock screen" @@ -1437,7 +1437,7 @@ msgid "" "The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want " "to use the Unsafe Browser, you have to restart Tails and enable it in the " "settings on the Welcome Screen." -msgstr "" +msgstr "The Unsafe Browser was not enabled on the Welcome Screen.\\n\\nIf you want to use the Unsafe Browser, you have to restart Tails and enable it in the settings on the Welcome Screen." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:98 msgid "" @@ -1627,19 +1627,19 @@ msgid "" "A captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n" "\n" "The Unsafe Browser is not anonymous and can deanonymize you. Use it only to log in to captive portals." -msgstr "" +msgstr "The Unsafe Browser allows you to log in to a captive portal.\n\nA captive portal is a web page that is displayed before you can access the Internet. Captive portals usually require to log in to the network or enter information such as an email address.\n\nThe Unsafe Browser is not anonymous and can deanonymise you. Use it only to log in to captive portals." #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572 msgid "Disable the Unsafe Browser (default)" -msgstr "" +msgstr "Disable the Unsafe Browser (default)" #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617 msgid "Enable the Unsafe Browser" -msgstr "" +msgstr "Enable the Unsafe Browser" #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100 msgid "Settings were loaded from the persistent storage." -msgstr "" +msgstr "Settings were loaded from the persistent storage." #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:168 msgid ""

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 20 Jul '20

20 Jul '20

commit 618db9d05f56e471220343248760fa3e02aba48f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 20 15:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+ka.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index ea9f609bf2..f49560e916 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -2047,11 +2047,13 @@ msgid "" "Some potential risks of running a digital security training are only valid " "in specific contexts." msgstr "" +"საფრთხეები, ციფრული უსაფრთხოებაში გადამზადებას შეიძლება ახლდეს, მხოლოდ " +"გარკვეულ პირობებში." #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "The potential risks associated with running a Tor training depend on:" -msgstr "" +msgstr "Tor-ის საკითხებში გადამზადების მოსალოდნელი საფრთხეები, დამოკიდებულია:" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) @@ -2233,7 +2235,7 @@ msgstr "" #: https//community.torproject.org/training/risks/ #: (content/training/risks/contents+en.lrpage.body) msgid "* [OONI disclaimer](https://ooni.io/about/risks/)" -msgstr "" +msgstr "* [OONI პასუხისმგებლობა](https://ooni.io/about/risks/)" #: https//community.torproject.org/training/code-of-conduct/ #: (content/training/code-of-conduct/contents+en.lrpage.title)

1 0

[snowflake-mobile/master] Added checkServedDate method
by cohosh＠torproject.org 20 Jul '20

20 Jul '20

commit a6ce892d1e7b33545b8b537caa985a6fa20478ff Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jul 11 01:10:34 2020 +0530 Added checkServedDate method --- .../org/torproject/snowflake/MainActivity.java | 55 +++++++++++++++++++++- app/src/main/res/values/strings.xml | 2 + 2 files changed, 56 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 dcd3146..a1103f4 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -21,6 +21,17 @@ import org.torproject.snowflake.fragments.AppSettingsFragment; import org.torproject.snowflake.fragments.MainFragment; import org.torproject.snowflake.interfaces.MainFragmentCallback; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; + +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.core.Observable; +import io.reactivex.rxjava3.core.Single; +import io.reactivex.rxjava3.disposables.Disposable; +import io.reactivex.rxjava3.schedulers.Schedulers; + /** * MainActivity is the main UI of the application. */ @@ -121,10 +132,52 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb } } + /** + * Function to check and update the date and users served. + * Resets served count if the past served date is greater than 24hrs. + */ + public void checkServedDate() { + Log.d(TAG, "checkServedDate: "); + SharedPreferences.Editor editor = sharedPreferences.edit(); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd-MMM-yyyy"); + + try { + Date currentDate = simpleDateFormat.parse(Calendar.getInstance().getTime().toString()); + String stringRecordedDate = sharedPreferences.getString(getString(R.string.served_date), ""); + + //No value for key. Set the date value to current date and users served to 0. + if (stringRecordedDate.equals("")) { + editor.putString(getString(R.string.served_date), simpleDateFormat.format(currentDate)); + editor.putInt(getString(R.string.users_served), 0); + } else { + //Check if the current system date is greater than recorded date, if so reset the "served" flag. + Date recordedDate = simpleDateFormat.parse(stringRecordedDate); + Log.d(TAG, "checkServedDate: Current Date:" + currentDate.toString() + " Recorded Date:" + recordedDate.toString()); + int comparision = currentDate.compareTo(recordedDate); + + if (comparision == 0) { + //Current date is same as recordedDate no need to reset. Since it's less than 24hrs. + return; + } else { + //Current date is bigger than recorded date. Reset the values. i.e comparision > 0 + editor.putString(getString(R.string.served_date), simpleDateFormat.format(currentDate)); + editor.putInt(getString(R.string.users_served), 0); + } + } + + editor.apply(); + + } catch (ParseException e) { + e.printStackTrace(); + Log.e(TAG, "checkServedDate: Invalid Date Parsing"); + } + } + + @Override public void onBackPressed() { //If the back is pressed on AppSettingsFragment take it back to MainFragment. - if(currentFragment == FragmentConstants.APP_SETTINGS_FRAGMENT) + if (currentFragment == FragmentConstants.APP_SETTINGS_FRAGMENT) startFragment(MainFragment.newInstance()); else super.onBackPressed(); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d737520..6855572 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="users_served">users_served</string> + <string name="served_date">date</string> </resources>

1 0

[snowflake-mobile/master] Launched checkServedDate on another thread and fixed date parsing exception
by cohosh＠torproject.org 20 Jul '20

20 Jul '20

commit 78ef0ce64c1a75fc1586694e8dcb0fd6d53c3154 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jul 11 01:51:51 2020 +0530 Launched checkServedDate on another thread and fixed date parsing exception --- .../org/torproject/snowflake/MainActivity.java | 32 ++++++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index a1103f4..4807285 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -27,7 +27,6 @@ import java.util.Calendar; import java.util.Date; import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; -import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.schedulers.Schedulers; @@ -40,6 +39,7 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb int currentFragment; private SharedPreferences sharedPreferences; private Button settingsButton; + private Disposable disposable; @Override protected void onCreate(Bundle savedInstanceState) { @@ -47,9 +47,16 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb setContentView(R.layout.activity_main); setSupportActionBar(findViewById(R.id.toolbar)); settingsButton = findViewById(R.id.settings_button); - sharedPreferences = GlobalApplication.getAppPreferences(); + + disposable = Single.fromCallable(this::checkServedDate) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe((status) -> { + //Update The TextView showing users served to user. + }); + //Creating notification channel if app is being run for the first time if (sharedPreferences.getBoolean(getString(R.string.initial_run_boolean), true)) { createNotificationChannel(); @@ -135,29 +142,33 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb /** * Function to check and update the date and users served. * Resets served count if the past served date is greater than 24hrs. + * + * @return True if the date parsing is done right without errors. */ - public void checkServedDate() { + public boolean checkServedDate() { Log.d(TAG, "checkServedDate: "); SharedPreferences.Editor editor = sharedPreferences.edit(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd-MMM-yyyy"); try { - Date currentDate = simpleDateFormat.parse(Calendar.getInstance().getTime().toString()); + String stringCurrentDate = simpleDateFormat.format(Calendar.getInstance().getTime()); String stringRecordedDate = sharedPreferences.getString(getString(R.string.served_date), ""); //No value for key. Set the date value to current date and users served to 0. if (stringRecordedDate.equals("")) { - editor.putString(getString(R.string.served_date), simpleDateFormat.format(currentDate)); + editor.putString(getString(R.string.served_date), stringCurrentDate); editor.putInt(getString(R.string.users_served), 0); } else { //Check if the current system date is greater than recorded date, if so reset the "served" flag. Date recordedDate = simpleDateFormat.parse(stringRecordedDate); + Date currentDate = simpleDateFormat.parse(stringCurrentDate); + Log.d(TAG, "checkServedDate: Current Date:" + currentDate.toString() + " Recorded Date:" + recordedDate.toString()); int comparision = currentDate.compareTo(recordedDate); if (comparision == 0) { //Current date is same as recordedDate no need to reset. Since it's less than 24hrs. - return; + return true; } else { //Current date is bigger than recorded date. Reset the values. i.e comparision > 0 editor.putString(getString(R.string.served_date), simpleDateFormat.format(currentDate)); @@ -170,7 +181,9 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb } catch (ParseException e) { e.printStackTrace(); Log.e(TAG, "checkServedDate: Invalid Date Parsing"); + return false; } + return true; } @@ -182,4 +195,11 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb else super.onBackPressed(); } + + @Override + protected void onDestroy() { + //Killing of thread + disposable.dispose(); + super.onDestroy(); + } }

1 0

[snowflake-mobile/master] Updated user_served in MyPersistentService
by cohosh＠torproject.org 20 Jul '20

20 Jul '20

commit 18a2285e3bda7ca8ac606e2377e92cb72b476aea Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jul 11 02:08:11 2020 +0530 Updated user_served in MyPersistentService --- .../java/org/torproject/snowflake/MyPersistentService.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 8d7da11..20f0a47 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -139,6 +139,18 @@ public class MyPersistentService extends Service { } editor.apply(); } + + /** + * users_served++ + */ + private void updateServedCount() { + SharedPreferences sp = GlobalApplication.getAppPreferences(); + sp.edit() + .putInt(getString(R.string.users_served), + sp.getInt(getString(R.string.users_served), 0) + 1) + .apply(); + } + /////////////// Notifications //////////////////////// /** @@ -308,6 +320,7 @@ public class MyPersistentService extends Service { if (STATE == DataChannel.State.OPEN) { updateNotification("Connection Established. Serving one client."); + updateServedCount(); } else if (STATE == DataChannel.State.CLOSED) { updateNotification("Connection is closed. Resending offer..."); closeConnections(true);

1 0

[snowflake-mobile/master] Moved creation of shared preferences to GlobalApplication
by cohosh＠torproject.org 20 Jul '20

20 Jul '20

commit c6936875ee48d0358f7c8b502605bffe5b6ddf0c Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jul 11 00:06:24 2020 +0530 Moved creation of shared preferences to GlobalApplication --- app/src/main/java/org/torproject/snowflake/GlobalApplication.java | 6 ++++++ app/src/main/java/org/torproject/snowflake/MainActivity.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/snowflake/GlobalApplication.java b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java index b38393f..6f09db6 100644 --- a/app/src/main/java/org/torproject/snowflake/GlobalApplication.java +++ b/app/src/main/java/org/torproject/snowflake/GlobalApplication.java @@ -16,6 +16,7 @@ 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; + private static SharedPreferences appPreferences; public static String getBrokerUrl() { //Checking to see if the switch is turned on. @@ -48,10 +49,15 @@ public class GlobalApplication extends Application { return map; } + public static SharedPreferences getAppPreferences() { + return appPreferences; + } + @Override public void onCreate() { Log.d(TAG, "onCreate: "); super.onCreate(); sharedPreferences = getDefaultSharedPreferences(this); + appPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); } } diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 1f8070f..dcd3146 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -37,7 +37,7 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb setSupportActionBar(findViewById(R.id.toolbar)); settingsButton = findViewById(R.id.settings_button); - sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); + sharedPreferences = GlobalApplication.getAppPreferences(); //Creating notification channel if app is being run for the first time if (sharedPreferences.getBoolean(getString(R.string.initial_run_boolean), true)) {

1 0

[snowflake-mobile/master] Fetched the count in the MainFragment and logged it
by cohosh＠torproject.org 20 Jul '20

20 Jul '20

commit 154331c578ecf5bdaf574792ee5be176af3d9ddb Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jul 11 02:44:47 2020 +0530 Fetched the count in the MainFragment and logged it --- .../org/torproject/snowflake/MainActivity.java | 26 ++++++++++++++++++---- .../snowflake/fragments/MainFragment.java | 10 ++++++++- .../snowflake/interfaces/MainFragmentCallback.java | 1 + 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 4807285..65480cc 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -36,6 +36,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers; */ public class MainActivity extends AppCompatActivity implements MainFragmentCallback { private static final String TAG = "MainActivity"; + public int servedCount; int currentFragment; private SharedPreferences sharedPreferences; private Button settingsButton; @@ -48,13 +49,21 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb setSupportActionBar(findViewById(R.id.toolbar)); settingsButton = findViewById(R.id.settings_button); sharedPreferences = GlobalApplication.getAppPreferences(); + servedCount = 0; - + //Launching another thread to check, reset served date if need be. disposable = Single.fromCallable(this::checkServedDate) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe((status) -> { - //Update The TextView showing users served to user. + .subscribe((status) -> { //Runs on main thread + //By this point the servedCount must be reset or left as is after checking the dates. + servedCount = sharedPreferences.getInt(getString(R.string.users_served), 0); + + Fragment mainFragment = getSupportFragmentManager().findFragmentByTag(Integer.toString(FragmentConstants.MAIN_FRAGMENT)); + //If the fragment is in foreground update the count. Or else ignore. + if (mainFragment != null) { + ((MainFragment) mainFragment).showServed(); + } }); //Creating notification channel if app is being run for the first time @@ -93,7 +102,7 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb getSupportFragmentManager() .beginTransaction() .replace(R.id.fragment_container, - fragment).commit(); + fragment, Integer.toString(currentFragment)).commit(); } /** @@ -120,6 +129,15 @@ public class MainActivity extends AppCompatActivity implements MainFragmentCallb return sharedPreferences.getBoolean(getString(R.string.is_service_running_bool), false); } + /** + * @return Total served users count in the past 24hrs. + */ + @Override + public int getServed() { + //By default 0 is returned until the thread finishes executing checkServedDate function. + return servedCount; + } + /** * Used to create a new notification channel if app is started for the first time on a device. */ 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 0ac2407..705cd0c 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -2,6 +2,7 @@ package org.torproject.snowflake.fragments; import android.content.Context; import android.os.Bundle; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,7 +11,6 @@ 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; @@ -21,6 +21,7 @@ import org.torproject.snowflake.interfaces.MainFragmentCallback; * create an instance of this fragment. */ public class MainFragment extends Fragment { + private static final String TAG = "MainFragment"; MainFragmentCallback callback; public MainFragment() { @@ -56,6 +57,9 @@ public class MainFragment extends Fragment { callback.serviceToggle(ForegroundServiceConstants.ACTION_START); }); + //Calling this in case we return back to this fragment from a different fragment. + showServed(); + // Inflate the layout for this fragment return rootView; } @@ -65,4 +69,8 @@ public class MainFragment extends Fragment { super.onAttach(context); callback = (MainFragmentCallback) context; } + + public void showServed() { + Log.d(TAG, "showServed: " + callback.getServed()); + } } \ 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 index 08e2d99..40da367 100644 --- a/app/src/main/java/org/torproject/snowflake/interfaces/MainFragmentCallback.java +++ b/app/src/main/java/org/torproject/snowflake/interfaces/MainFragmentCallback.java @@ -3,4 +3,5 @@ package org.torproject.snowflake.interfaces; public interface MainFragmentCallback { boolean isServiceRunning(); void serviceToggle(String action); + int getServed(); }

1 0

[snowflake-mobile/master] Added text view to show the user how many clients he has served
by cohosh＠torproject.org 20 Jul '20

20 Jul '20

commit c24291af2642ae56022bab5136dfc5f92361ca69 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Sat Jul 11 02:59:38 2020 +0530 Added text view to show the user how many clients he has served --- .../org/torproject/snowflake/fragments/MainFragment.java | 13 ++++++++++++- app/src/main/res/layout/fragment_main_fragment.xml | 12 ++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) 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 705cd0c..6841be3 100644 --- a/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java +++ b/app/src/main/java/org/torproject/snowflake/fragments/MainFragment.java @@ -2,11 +2,13 @@ package org.torproject.snowflake.fragments; import android.content.Context; import android.os.Bundle; +import android.text.Layout; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; @@ -23,6 +25,7 @@ import org.torproject.snowflake.interfaces.MainFragmentCallback; public class MainFragment extends Fragment { private static final String TAG = "MainFragment"; MainFragmentCallback callback; + TextView usersServedTV; public MainFragment() { // Required empty public constructor @@ -49,7 +52,9 @@ public class MainFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View rootView = inflater.inflate(R.layout.fragment_main_fragment, container, false); + usersServedTV = rootView.findViewById(R.id.users_served); Button startButton = rootView.findViewById(R.id.start_button); + startButton.setOnClickListener(v -> { if (callback.isServiceRunning()) //Toggling the service. callback.serviceToggle(ForegroundServiceConstants.ACTION_STOP); @@ -71,6 +76,12 @@ public class MainFragment extends Fragment { } public void showServed() { - Log.d(TAG, "showServed: " + callback.getServed()); + int served = callback.getServed(); + Log.d(TAG, "showServed: " + served); + + if(served > 0){ + usersServedTV.setVisibility(View.VISIBLE); + usersServedTV.setText("Users you have helped circumvent censorship in the past day \n" + served); + } } } \ 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 bd6a855..d7f2bd9 100644 --- a/app/src/main/res/layout/fragment_main_fragment.xml +++ b/app/src/main/res/layout/fragment_main_fragment.xml @@ -14,4 +14,16 @@ android:foreground="?android:attr/selectableItemBackground" android:text="Service Toggle" /> + <TextView + android:id="@+id/users_served" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/start_button" + android:layout_centerHorizontal="true" + android:paddingTop="10dp" + android:paddingLeft="50dp" + android:paddingRight="50dp" + android:gravity="center" + android:visibility="gone" /> + </RelativeLayout> \ No newline at end of file

1 0