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

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 06 Jun '20

06 Jun '20

commit 2bd76ca4a85f307984e367541ec3df1369d88b7c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 6 18:51:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ja/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/torbutton.properties b/ja/torbutton.properties index 2cd03001f0..9263da425a 100644 --- a/ja/torbutton.properties +++ b/ja/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=%S 更新をダウンロードしています # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=接続が暗号化されています (Onion サービス、%1$S、鍵長 %2$S bit、%3$S) pageInfo_OnionEncryption=接続が暗号化されています (Onion サービス) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Onion 名: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=詳細情報

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 06 Jun '20

06 Jun '20

commit d7e3409b469a4a0b3d1d8f296258e789deaecc77 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 6 18:45:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ja/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index 6bac884bdb..acafda2f50 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-06-06 18:43+0000\n" +"Last-Translator: 323484\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,7 +100,7 @@ msgstr "このブリッジのQRコードを携帯端末などのデバイスで #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB でエラーが発生しました。" #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." @@ -185,7 +185,7 @@ msgstr "%sブ%sリッジを入手する" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[これは自動送信された電子メールです。]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -401,7 +401,7 @@ msgstr "" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)" -msgstr "" +msgstr "( IPv6 ブリッジをリクエスト )" #: bridgedb/strings.py:175 msgid "(Request obfs4 obfuscated bridges.)"

1 0

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

06 Jun '20

commit 704c4f2ab43977046216537724704135f797edcd Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 6 14:50:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ka.po | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 9c336e2953..25711c007e 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -647,11 +647,13 @@ msgid "" "The first checkbox asks if access to the Tor network is blocked or censored " "on your connection." msgstr "" +"პირველი მოსანიშნი გეკითხებათ, გაქვთ თუ არა Tor-ქსელთან წვდომა და შეზღუდული " +"ხომ არაა." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If you do not believe this is the case, leave this unchecked." -msgstr "" +msgstr "თუ მიგაჩნიათ რომ არა, დატოვეთ მოუნიშნავი." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -660,6 +662,8 @@ msgid "" "connect to the Tor network and no other solutions have worked, check the " "checkbox." msgstr "" +"თუ იცით რომ ცენზურის ქვეშ ხართ ან სცადეთ დაკავშირება Tor-ქსელთან და ვერ " +"მოხერხდა, ამასთან ვერც სხვა გადაწყვეტებმა უშველა, მაშინ მონიშნეთ ეს უჯრა." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -667,6 +671,8 @@ msgid "" "This will display the [Circumvention](../circumvention) section to configure" " a pluggable transport." msgstr "" +"შედეგად გამოჩნდება [გვერდის ავლის](../circumvention) არე, საიდანაც შეძლებთ " +"გამართოთ მისაერთებელი გადამყვანები." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -899,7 +905,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "Your settings will automatically be saved once you close the tab." -msgstr "" +msgstr "თქვენი პარამეტრები ავტომატურად შეინახება ჩანართის დახურვისას." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -922,6 +928,8 @@ msgid "" "If you are trying to circumvent a blocked connection for the first time, you" " should try the different transports: obfs4, snowflake, or meek-azure." msgstr "" +"თუ პირველად ცდილობთ შეზღუდული ქსელისთვის გვერდის ავლას, ჯობია მოსინჯოთ " +"სხვადასხვა სახის გადამყვანები: obfs4, snowflake ან meek-azure." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -1062,6 +1070,9 @@ msgid "" "\"Request a bridge from torproject.org\" and click \"Request a Bridge...\" " "for BridgeDB to provide a bridge." msgstr "" +"როცა მონიშნავთ „Tor შეზღუდულია ჩემს ქვეყანაში“, აირჩიეთ „გადამცემი ხიდის " +"მოთხოვნა საიტიდან torproject.org“, შემდეგ კი დაწკაპეთ „გადამცემი ხიდის " +"მოთხოვნა...“ და BridgeDB მოგაწვდით მას." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1069,6 +1080,8 @@ msgid "" "Complete the CAPTCHA and click \"Submit.\" Click \"Connect\" to save your " "settings." msgstr "" +"გაიარეთ CAPTCHA და დაწკაპეთ „გაგზავნა“. დააჭირეთ „დაკავშირებას“ პარამეტრების" +" დასამახსოვრებლად." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1077,6 +1090,9 @@ msgid "" "the option \"Request a bridge from torproject.org,\" click \"Request a New " "Bridge...\" for BridgeDB to provide a bridge." msgstr "" +"„ხიდების“ განყოფილებაში, მონიშნეთ „ხიდის გამოყენება“ და შემდეგ „გადამცემი " +"ხიდის მოთხოვნა საიტიდან torproject.org“, დაწკაპეთ „ახალი გადამცემი ხიდის " +"მოთხოვნა...\" და BridgeDB მოგაწვდით მას." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1084,6 +1100,8 @@ msgid "" "Complete the CAPTCHA and click \"Submit.\" Your setting will automatically " "be saved once you close the tab." msgstr "" +"გაიარეთ CAPTCHA და დაწკაპეთ „გაგზავნა“. თქვენი პარამეტრები ავტომატურად " +"შეინახება ჩანართის დახურვისას." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body)

1 0

[tor-browser-build/master] Changelog fixup
by gk＠torproject.org 06 Jun '20

06 Jun '20

commit 2c84d8d13c7313f88db9418aab0d4ff65c6610d6 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 6 08:01:02 2020 +0000 Changelog fixup --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 534c207..aa55f4f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -95,7 +95,7 @@ Tor Browser 9.5 -- June 2 2020 * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha * Build System * All Platforms - * Go to 1.13.11 + * Bump Go to 1.13.11 * Bug 33380: Add *.json to sha256sums-unsigned-build.txt * Windows * Bug 33802: --enable-secure-api is not supported anymore in mingw-w64

1 0

[onionperf/master] Remove if condition that checks for args.model.
by karsten＠torproject.org 06 Jun '20

06 Jun '20

commit e580cb885d9bb18298f65c04e541d2152a8e7a0e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jun 6 08:13:58 2020 +0200 Remove if condition that checks for args.model. Spotted by phw, part of #29370. --- onionperf/onionperf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index 6078d46..74285d1 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -328,13 +328,6 @@ def measure(args): # validate paths and run if args.torpath is not None and args.tgenpath is not None: os.chdir(args.prefix) - if args.model: - # load custom model instead of Torperf model - pass - else: - # build a Torperf model - # model.TorperfModel(tgen_port="{0}".format(tgen_port), tgen_servers=server_urls, socksproxy="127.0.0.1:{0}".format(socks_port)) - pass client_connect_ip = args.tgenconnectip client_connect_port = args.tgenconnectport

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 05 Jun '20

05 Jun '20

commit 1b2d53ad83e7ae7c4d8cbd45a526111057245e05 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 5 22:52:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ia/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ia/network-settings.dtd b/ia/network-settings.dtd index b374aa996a..812e48b8b8 100644 --- a/ia/network-settings.dtd +++ b/ia/network-settings.dtd @@ -66,7 +66,7 @@ <!ENTITY torPreferences.torSettings "Tor Settings"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > <!ENTITY torPreferences.learnMore "Learn More"> -<!ENTITY torPreferences.bridges "Bridges"> +<!ENTITY torPreferences.bridges "Pontes"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> <!ENTITY torPreferences.useBridge "Use a bridge"> <!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">

1 0

[gettor/master] Remove logging of successful db query
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 4ed0f9ae02de837cd278767fa84167c728f18879 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri May 29 15:08:11 2020 -0400 Remove logging of successful db query --- gettor/utils/db.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gettor/utils/db.py b/gettor/utils/db.py index d6bf153..c2e2634 100644 --- a/gettor/utils/db.py +++ b/gettor/utils/db.py @@ -32,7 +32,6 @@ class SQLite3(object): Query callback Log that the database query has been executed and return results """ - log.msg("Database query executed successfully.") return results def query_errback(self, error=None):

1 0

[snowflake-mobile/master] Added notification and notification channel
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 9c39e6bdb79a92f8c3c76f1be90f6ef04a410968 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 5 03:38:03 2020 +0530 Added notification and notification channel --- .../org/torproject/snowflake/MainActivity.java | 31 ++++++++++ .../torproject/snowflake/MyPersistentService.java | 68 ++++++++++++++++++++++ .../constants/ForegroundServiceConstants.java | 4 ++ app/src/main/res/values/strings.xml | 5 +- 4 files changed, 107 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 188eb57..b4ebcd8 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -1,7 +1,11 @@ package org.torproject.snowflake; +import android.app.NotificationChannel; +import android.app.NotificationManager; +import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.widget.Button; @@ -21,8 +25,16 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); + //Creating notification channel if app is being run for the first time + if (sharedPreferences.getBoolean(getString(R.string.initial_run_boolean), true)) { + createNotificationChannel(); + //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. @@ -57,4 +69,23 @@ public class MainActivity extends AppCompatActivity { private boolean isServiceRunning() { return sharedPreferences.getBoolean(getString(R.string.is_service_running_bool), false); } + + /** + * Used to create a new notification channel if app is started for the first time on a device. + */ + private void createNotificationChannel() { + //Versions after Android Oreo mandates the use of notification channels. + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + + NotificationChannel channel = new NotificationChannel(ForegroundServiceConstants.NOTIFICATION_CHANNEL_ID, + getString(R.string.not_channel_name), + NotificationManager.IMPORTANCE_HIGH); + channel.setDescription(getString(R.string.not_channel_desc)); + channel.enableLights(true); + channel.setLightColor(Color.RED); + channel.setSound(null, null); + notificationManager.createNotificationChannel(channel); + } + } } diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index cc4806d..5d6c03e 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -1,16 +1,84 @@ package org.torproject.snowflake; +import android.app.Notification; +import android.app.PendingIntent; import android.app.Service; import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Build; import android.os.IBinder; +import android.util.Log; import androidx.annotation.Nullable; +import org.torproject.snowflake.constants.ForegroundServiceConstants; + //Main foreground service to handle network calls and to relay the data in the back ground. public class MyPersistentService extends Service { + private static final String TAG = "MyPersistentService"; + private SharedPreferences sharedPreferences; + @Nullable @Override public IBinder onBind(Intent intent) { return null; } + + @Override + public void onCreate() { + super.onCreate(); + Log.d(TAG, "onCreate: Service Created"); + + sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); + sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_RUNNING); + Notification notification = createPersistentNotification(false, null); + startForeground(ForegroundServiceConstants.DEF_NOTIFICATION_ID, notification); + } + + private void sharedPreferencesHelper(final int setState) { + Log.d(TAG, "sharedPreferencesHelper: Setting Shared Preference Running To: " + setState); + SharedPreferences.Editor editor = sharedPreferences.edit(); + + if (setState == ForegroundServiceConstants.SERVICE_RUNNING) { + editor.putBoolean(getString(R.string.is_service_running_bool), true); + } else { + editor.putBoolean(getString(R.string.is_service_running_bool), false); + } + editor.apply(); + } + + /** + * Create a new persistent notification + * + * @param isUpdate is this new notification an update to current one? + * @param update String that is to be updated will current. Send "null" if isUpdate is false. + * @return New Notification with given parameters. + */ + private Notification createPersistentNotification(final boolean isUpdate, final String update) { + Intent persistentNotIntent = new Intent(this, MyPersistentService.class); + PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, persistentNotIntent, 0); + + Notification.Builder builder; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + builder = new Notification.Builder(this, ForegroundServiceConstants.NOTIFICATION_CHANNEL_ID); + else + builder = new Notification.Builder(this); + + builder + .setContentTitle("Snowflake Service") + .setContentIntent(pendingIntent) + .setSmallIcon(R.mipmap.ic_launcher) + .setPriority(Notification.PRIORITY_HIGH); // Android 26 and above needs priority. + + //If it's a notification update. Set the text to updated notification. + if (isUpdate) { + builder.setContentText(update) + .setTicker(update); + } else { + builder.setContentText("Snowflake Proxy Running") + .setTicker("Snowflake Proxy Running"); + } + + return builder.build(); + } } diff --git a/app/src/main/java/org/torproject/snowflake/constants/ForegroundServiceConstants.java b/app/src/main/java/org/torproject/snowflake/constants/ForegroundServiceConstants.java index b446f0e..6438b6c 100644 --- a/app/src/main/java/org/torproject/snowflake/constants/ForegroundServiceConstants.java +++ b/app/src/main/java/org/torproject/snowflake/constants/ForegroundServiceConstants.java @@ -7,4 +7,8 @@ public class ForegroundServiceConstants { //Shared Preferences State public static final int SERVICE_RUNNING = 1; public static final int SERVICE_STOPPED = 0; + + //Notification Constants + public static final String NOTIFICATION_CHANNEL_ID = "SNOWFLAKE_ENDLESS_SERVICE"; + public static final int DEF_NOTIFICATION_ID = 555; } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 85551fb..7448d1e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,8 @@ <resources> - <string name="app_name">Snowflake</string> + <string name="app_name">TestFlake</string> <string name="sharedpreference_file">org.torproject.snowflake.snowflake_preferences</string> <string name="is_service_running_bool">is_service_running</string> + <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> </resources>

1 0

[snowflake-mobile/master] Added bare service class and called it from MainActivity
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit cfbf2d3f4863f591d451303820476a0d5fac6f4b Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 5 02:18:34 2020 +0530 Added bare service class and called it from MainActivity --- .idea/misc.xml | 2 +- app/build.gradle | 4 ++ .../org/torproject/snowflake/MainActivity.java | 60 ++++++++++++++-------- .../constants/ForegroundServiceConstants.java | 10 ++++ app/src/main/res/values/strings.xml | 2 + 5 files changed, 55 insertions(+), 23 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..7bfef59 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/app/build.gradle b/app/build.gradle index 113f2a2..9580614 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,6 +20,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } diff --git a/app/src/main/java/org/torproject/snowflake/MainActivity.java b/app/src/main/java/org/torproject/snowflake/MainActivity.java index 240e285..188eb57 100644 --- a/app/src/main/java/org/torproject/snowflake/MainActivity.java +++ b/app/src/main/java/org/torproject/snowflake/MainActivity.java @@ -1,44 +1,60 @@ package org.torproject.snowflake; -import androidx.appcompat.app.AppCompatActivity; - -import android.app.ActivityManager; -import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Build; import android.os.Bundle; import android.widget.Button; -import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; + +import org.torproject.snowflake.constants.ForegroundServiceConstants; + +/** + * MainActivity is the main UI of the application. + */ public class MainActivity extends AppCompatActivity { + private static final String TAG = "MainActivity"; + private SharedPreferences sharedPreferences; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); Button startButton = findViewById(R.id.start_button); - startButton.setOnClickListener(v -> { - if (isServiceRunning()){ //Toggling the service. - //TODO: Start service - } - else{ - //TODO: Stop service - } + 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. } - //Test to see if the service is already running. - private boolean isServiceRunning() { - ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE); - if (manager != null) { - for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) { - if (MyPersistentService.class.getName().equals(service.service.getClassName())) { - return true; - } - } + /** + * Turn service on/off. + * + * @param action An Action from ForegroundServiceConstants. + */ + private void serviceToggle(String action) { + Intent serviceIntent = new Intent(MainActivity.this, MyPersistentService.class); + serviceIntent.setAction(action); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + startForegroundService(serviceIntent); + } else { + startService(serviceIntent); } - return false; + } + + /** + * Test to see if the MyPersistentService is running or not. + * + * @return boolean whether the service is running or not. + */ + private boolean isServiceRunning() { + return sharedPreferences.getBoolean(getString(R.string.is_service_running_bool), false); } } diff --git a/app/src/main/java/org/torproject/snowflake/constants/ForegroundServiceConstants.java b/app/src/main/java/org/torproject/snowflake/constants/ForegroundServiceConstants.java new file mode 100644 index 0000000..b446f0e --- /dev/null +++ b/app/src/main/java/org/torproject/snowflake/constants/ForegroundServiceConstants.java @@ -0,0 +1,10 @@ +package org.torproject.snowflake.constants; + +public class ForegroundServiceConstants { + public static final String ACTION_START = "1"; + public static final String ACTION_STOP = "0"; + + //Shared Preferences State + public static final int SERVICE_RUNNING = 1; + public static final int SERVICE_STOPPED = 0; +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a10296e..85551fb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,5 @@ <resources> <string name="app_name">Snowflake</string> + <string name="sharedpreference_file">org.torproject.snowflake.snowflake_preferences</string> + <string name="is_service_running_bool">is_service_running</string> </resources>

1 0

[snowflake-mobile/master] Added onStartCommand to start and stop service
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 91871788d224ba0b4bb0956b369ea6a1345c893e Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 5 03:52:08 2020 +0530 Added onStartCommand to start and stop service --- .../torproject/snowflake/MyPersistentService.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index bdb2e54..5bafada 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -25,6 +25,24 @@ public class MyPersistentService extends Service { } @Override + 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); + + if (intent != null) { +// if (intent.getAction().equals(ForegroundServiceConstants.ACTION_START)) +// //TODO: Start Service +// else +// //TODO: Stop Service + } else { + Log.d("onStartCommand:", "Null intent detected"); //Intent is null if system restarts the service. + } + + //If the service is killed. OS will restart this service if it's START_STICKY. + return START_STICKY; + } + + @Override public void onCreate() { super.onCreate(); Log.d(TAG, "onCreate: Service Created"); @@ -35,6 +53,16 @@ public class MyPersistentService extends Service { startForeground(ForegroundServiceConstants.DEF_NOTIFICATION_ID, notification); } + @Override + public void onDestroy() { + Log.d(TAG, "onDestroy: Service Destroyed"); + sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_STOPPED); + + //TODO: Dispose all connections. + + super.onDestroy(); + } + /** * Helper function to edit shared preference file. *

1 0