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

[snowflake-mobile/master] Added stopping service function
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 07b99ebf2c066de57b8ff3bdc52e4e1c98531106 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 5 04:02:15 2020 +0530 Added stopping service function --- .../torproject/snowflake/MyPersistentService.java | 57 ++++++++++++++++++++-- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 5bafada..564fe03 … [View More]100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -7,16 +7,21 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Build; import android.os.IBinder; +import android.os.PowerManager; 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. +/** + * Main Snowflake implementation of foreground service to relay data in the background. + */ public class MyPersistentService extends Service { private static final String TAG = "MyPersistentService"; private SharedPreferences sharedPreferences; + private boolean isServiceStarted; + private PowerManager.WakeLock wakeLock; @Nullable @Override @@ -30,12 +35,13 @@ public class MyPersistentService extends Service { 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 + if (intent.getAction().equals(ForegroundServiceConstants.ACTION_START)) + startService(); + else + stopService(); } else { Log.d("onStartCommand:", "Null intent detected"); //Intent is null if system restarts the service. + startService(); //Starting the service since it's a "restart" of the service. } //If the service is killed. OS will restart this service if it's START_STICKY. @@ -114,4 +120,45 @@ public class MyPersistentService extends Service { return builder.build(); } + + //Starting and stopping service + + /** + * Use to star/re-start the service + */ + private void startService() { + if (isServiceStarted) { + Log.d(TAG, "startService: Service Already running."); + return; + } + Log.d(TAG, "startService: Starting foreground service"); + isServiceStarted = true; + + PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); + wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, + "MyApp::MyWakelockTag"); + wakeLock.acquire(); //WakeLock acquired for unlimited amount of time. + + /// + //TODO: Start WebRTC connection. + } + + /** + * Use to stop the service. + */ + private void stopService() { + Log.d(TAG, "stopService:Stopping the foreground service"); + try { + if (wakeLock != null && wakeLock.isHeld()) { + wakeLock.release(); + } + stopForeground(true); //To remove the notification. + stopSelf(); //Calls onDestroy to destroy the service and dispose all the connections + } catch (Exception e) { + Log.d(TAG, "stopService: Failed with: " + e.getMessage()); + } + isServiceStarted = false; + } + + ///////////////////////////////////// } [View Less]

1 0

[snowflake-mobile/master] Added permissions and registered the service
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 712dbdd579266bbcfc1389de15cdb5cc2aa8df87 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 5 03:39:51 2020 +0530 Added permissions and registered the service --- app/src/main/AndroidManifest.xml | 12 ++++++++++++ .../java/org/torproject/snowflake/MyPersistentService.java | 11 ++++++++--- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/… [View More]app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9e4b070..7728955 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,12 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.snowflake"> + <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.WAKE_LOCK" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> + <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" @@ -9,6 +15,12 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> + + <service + android:name="org.torproject.snowflake.MyPersistentService" + android:enabled="true" + android:exported="false" /> + <activity android:name=".MainActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 5d6c03e..bdb2e54 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -29,12 +29,17 @@ public class MyPersistentService extends Service { super.onCreate(); Log.d(TAG, "onCreate: Service Created"); - sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); - sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_RUNNING); + sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); //Assigning the shared preferences + sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_RUNNING); //Editing the shared preferences Notification notification = createPersistentNotification(false, null); startForeground(ForegroundServiceConstants.DEF_NOTIFICATION_ID, notification); } + /** + * Helper function to edit shared preference file. + * + * @param setState State from ForegroundServiceConstants + */ private void sharedPreferencesHelper(final int setState) { Log.d(TAG, "sharedPreferencesHelper: Setting Shared Preference Running To: " + setState); SharedPreferences.Editor editor = sharedPreferences.edit(); @@ -51,7 +56,7 @@ public class MyPersistentService extends Service { * 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. + * @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) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7448d1e..d737520 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ <resources> - <string name="app_name">TestFlake</string> + <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> <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> [View Less]

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 854e4df581f68bc05e3e7f9589f9703e09130273 Merge: 7c7e2e2fe 754d4e9a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 12:37:30 2020 -0400 Merge branch 'maint-0.4.3' into release-0.4.3 .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 1930828957c9caeeeec165c9068f5898d092f268 Merge: e75583e71 c1add51bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 12:37:29 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 754d4e9a17b216c8b3bf5f4ded47d0fd6d1634fa Merge: 6b05d447b 193082895 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 12:37:29 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.4.3] Update and upgrade Pacman before installing dependencies in AppVeyor.
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit c1add51bcc49c299391e662603b590699031496c Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 2 13:07:54 2020 +0000 Update and upgrade Pacman before installing dependencies in AppVeyor. This patch makes sures that AppVeyor upgrades its Pacman (the package manager) before installing the Tor dependencies. See: https://bugs.torproject.org/34384 --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml … [View More]

1 0

[tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 6eee995cc9bbe672c954222b41b6ec28da5a3d14 Merge: d63eeb1b6 193082895 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 12:37:29 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.4.2] Update and upgrade Pacman before installing dependencies in AppVeyor.
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit c1add51bcc49c299391e662603b590699031496c Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 2 13:07:54 2020 +0000 Update and upgrade Pacman before installing dependencies in AppVeyor. This patch makes sures that AppVeyor upgrades its Pacman (the package manager) before installing the Tor dependencies. See: https://bugs.torproject.org/34384 --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml … [View More]

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit 6b9f05b0008eeeb3c50e8c664f94a60fbb907c32 Merge: ff68f4fe1 c1add51bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 5 12:37:29 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.3.5] Update and upgrade Pacman before installing dependencies in AppVeyor.
by nickm＠torproject.org 05 Jun '20

05 Jun '20

commit c1add51bcc49c299391e662603b590699031496c Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 2 13:07:54 2020 +0000 Update and upgrade Pacman before installing dependencies in AppVeyor. This patch makes sures that AppVeyor upgrades its Pacman (the package manager) before installing the Tor dependencies. See: https://bugs.torproject.org/34384 --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml … [View More]

1 0