diff options
author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-11-06 18:19:17 +0000 |
---|---|---|
committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2022-11-06 18:19:17 +0000 |
commit | 99b27efb59ba642bfca0c6fbabfaa2c6631e15b9 (patch) | |
tree | c55aed6119dff29a84d7120bedf88e2df1775597 /fakelocation/src/main/java/foundation | |
parent | 9701ef06a47560ca429f1e7fffd0958b376ec628 (diff) | |
parent | fdeecefd34c00b225bd58f6cc7135a95e21728f1 (diff) |
Merge branch '5561-name_the_vpn_already_running' into 'main'
5561: display name of other VPNrunning always on.
See merge request e/os/advanced-privacy!96
Diffstat (limited to 'fakelocation/src/main/java/foundation')
2 files changed, 8 insertions, 10 deletions
diff --git a/fakelocation/src/main/java/foundation/e/privacymodules/fakelocation/FakeLocationModule.kt b/fakelocation/src/main/java/foundation/e/privacymodules/fakelocation/FakeLocationModule.kt index 709963d..4245836 100644 --- a/fakelocation/src/main/java/foundation/e/privacymodules/fakelocation/FakeLocationModule.kt +++ b/fakelocation/src/main/java/foundation/e/privacymodules/fakelocation/FakeLocationModule.kt @@ -34,7 +34,7 @@ import android.util.Log * * @param context an Android context, to retrieve system services for example. */ -class FakeLocationModule(private val context: Context): IFakeLocationModule { +class FakeLocationModule(private val context: Context) : IFakeLocationModule { companion object { private const val TAG = "FakeLocationModule" } @@ -60,11 +60,10 @@ class FakeLocationModule(private val context: Context): IFakeLocationModule { providers.forEach { provider -> try { locationManager.removeTestProvider(provider) - } catch(e: Exception) { + } catch (e: Exception) { Log.w(TAG, "Test provider $provider already removed.") } - locationManager.addTestProvider( provider, false, @@ -75,12 +74,13 @@ class FakeLocationModule(private val context: Context): IFakeLocationModule { true, true, ProviderProperties.POWER_USAGE_LOW, - ProviderProperties.ACCURACY_FINE) + ProviderProperties.ACCURACY_FINE + ) try { locationManager.setTestProviderEnabled(provider, true) } catch (e: Exception) { - Log.e(TAG, "Can't enable test $provider", e) - } + Log.e(TAG, "Can't enable test $provider", e) + } } } diff --git a/fakelocation/src/main/java/foundation/e/privacymodules/fakelocation/FakeLocationService.kt b/fakelocation/src/main/java/foundation/e/privacymodules/fakelocation/FakeLocationService.kt index 1337ddd..34620fe 100644 --- a/fakelocation/src/main/java/foundation/e/privacymodules/fakelocation/FakeLocationService.kt +++ b/fakelocation/src/main/java/foundation/e/privacymodules/fakelocation/FakeLocationService.kt @@ -17,7 +17,6 @@ package foundation.e.privacymodules.fakelocation - import android.app.Service import android.content.Context import android.content.Intent @@ -25,7 +24,7 @@ import android.os.CountDownTimer import android.os.IBinder import android.util.Log -class FakeLocationService: Service() { +class FakeLocationService : Service() { enum class Actions { START_FAKE_LOCATION @@ -83,10 +82,9 @@ class FakeLocationService: Service() { super.onDestroy() } - private fun initTimer() { countDownTimer?.cancel() - countDownTimer = object: CountDownTimer(PERIOD_UPDATES_SERIE, PERIOD_LOCATION_UPDATE) { + countDownTimer = object : CountDownTimer(PERIOD_UPDATES_SERIE, PERIOD_LOCATION_UPDATE) { override fun onTick(millisUntilFinished: Long) { fakeLocation?.let { try { |