From 731c02878cba353ec3df4ba6f272b29985ee5232 Mon Sep 17 00:00:00 2001 From: atavism Date: Thu, 14 Mar 2024 14:07:24 -0700 Subject: [PATCH] Run code cleanup in Android Studio (#1020) * Run code cleanup in Android Studio * update comment * update lowercase call * Update CI release branch --- .github/workflows/release.yml | 2 +- android/app/build.gradle | 7 ++----- .../org/getlantern/lantern/test/BaseTest.java | 2 +- .../getlantern/lantern/test/UiWatchers.java | 4 ++-- .../org/getlantern/lantern/MainActivity.kt | 10 +++++----- .../lantern/activity/FreeKassaActivity.kt | 2 +- .../lantern/activity/WebViewActivity.kt | 12 ++++++------ .../lantern/fragment/ProgressDialogFragment.kt | 2 +- .../model/AccountInitializationStatus.kt | 2 +- .../getlantern/lantern/model/InAppBilling.kt | 18 +++++++++--------- .../lantern/model/LanternSessionManager.kt | 4 ++-- .../org/getlantern/lantern/model/ProError.kt | 4 +--- .../org/getlantern/lantern/model/ProUser.kt | 4 ++-- .../lantern/notification/NotificationHelper.kt | 4 ++-- .../notification/NotificationReceiver.kt | 2 +- .../lantern/plausible/PlausibleClient.kt | 2 +- .../getlantern/lantern/service/AutoStarter.kt | 4 ++-- .../lantern/service/LanternService.kt | 2 +- .../org/getlantern/lantern/util/ActivityExt.kt | 2 +- .../getlantern/lantern/util/ApkInstaller.kt | 4 ++-- .../lantern/util/ApkSignatureVerifier.kt | 2 +- .../org/getlantern/lantern/util/DeviceInfo.kt | 2 +- .../lantern/util/LanternHttpClient.kt | 5 +++-- .../lantern/util/LanternProxySelector.kt | 8 ++++---- .../getlantern/lantern/util/PermissionUtil.kt | 2 +- .../org/getlantern/lantern/util/PlansUtil.kt | 12 ++++++------ 26 files changed, 60 insertions(+), 64 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3c7d18d40..0f074f25d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Publish releases on: push: - branches: [ atavism/android-agp-8.0 ] + branches: [ main ] tags: - '*' diff --git a/android/app/build.gradle b/android/app/build.gradle index 702789829..4ad9af709 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -21,11 +21,8 @@ android { enableSplit = true } language { - // Specifies that the app bundle should not support - // configuration APKs for language resources. These - // resources are instead packaged with each base and - // dynamic feature APK. - // + // Specifies that the app bundle should not support configuration APKs for language resources. + // These resources are instead packaged with each base and dynamic feature APK. // See https://stackoverflow.com/a/52733674 enableSplit = false } diff --git a/android/app/src/androidTest/java/org/getlantern/lantern/test/BaseTest.java b/android/app/src/androidTest/java/org/getlantern/lantern/test/BaseTest.java index 7a9e60142..92ea35101 100644 --- a/android/app/src/androidTest/java/org/getlantern/lantern/test/BaseTest.java +++ b/android/app/src/androidTest/java/org/getlantern/lantern/test/BaseTest.java @@ -21,7 +21,7 @@ protected Context getTargetContext() { public void setupTempDir() { tempDir = new File( getTargetContext().getCacheDir(), - new Long(new Random().nextLong()).toString() + Long.valueOf(new Random().nextLong()).toString() ); tempDir.mkdirs(); } diff --git a/android/app/src/androidTest/java/org/getlantern/lantern/test/UiWatchers.java b/android/app/src/androidTest/java/org/getlantern/lantern/test/UiWatchers.java index 9b13a5b63..7bfe00c7e 100644 --- a/android/app/src/androidTest/java/org/getlantern/lantern/test/UiWatchers.java +++ b/android/app/src/androidTest/java/org/getlantern/lantern/test/UiWatchers.java @@ -39,11 +39,11 @@ public boolean checkForCondition() { device.registerWatcher("ANR2", new UiWatcher() { @Override public boolean checkForCondition() { - Log.d(LOG_TAG, "Checking if there's an 'app isn\'t responding' dialog"); + Log.d(LOG_TAG, "Checking if there's an 'app isn't responding' dialog"); UiObject window = new UiObject(new UiSelector().packageName("android") .textContains("isn't responding.")); if (window.exists()) { - Log.d(LOG_TAG, "There's an 'app isn\'t responding' dialog"); + Log.d(LOG_TAG, "There's an 'app isn't responding' dialog"); String errorText = null; try { errorText = window.getText(); diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/MainActivity.kt b/android/app/src/main/kotlin/org/getlantern/lantern/MainActivity.kt index 83f8846d6..849b825ab 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/MainActivity.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/MainActivity.kt @@ -310,12 +310,12 @@ class MainActivity : FlutterActivity(), MethodChannel.MethodCallHandler, response: Response, user: ProUser, ) { - val devices = user?.devices + val devices = user.devices val deviceID = LanternApp.getSession().deviceID() // if the payment test mode is enabled // then do nothing To avoid restarting app while debugging // we are setting static user for payment mode - if (user?.isProUser == false || LanternApp.getSession().isPaymentTestMode) return + if (user.isProUser == false || LanternApp.getSession().isPaymentTestMode) return // Switch to free account if device it not linked devices?.filter { it.id == deviceID }?.run { @@ -386,7 +386,7 @@ class MainActivity : FlutterActivity(), MethodChannel.MethodCallHandler, var key = countryCode var survey = loconf.surveys!![key] if (survey == null) { - key = countryCode.toLowerCase() + key = countryCode.lowercase() survey = loconf.surveys!![key] } if (survey == null || !survey.enabled) { @@ -408,13 +408,13 @@ class MainActivity : FlutterActivity(), MethodChannel.MethodCallHandler, ) val userType = survey.userType if (userType != null) { - if (userType == "free" && LanternApp.getSession().isProUser()) { + if (userType == "free" && LanternApp.getSession().isProUser) { Logger.debug( SURVEY_TAG, "Not showing messages targetted to free users to Pro users", ) return - } else if (userType == "pro" && !LanternApp.getSession().isProUser()) { + } else if (userType == "pro" && !LanternApp.getSession().isProUser) { Logger.debug( SURVEY_TAG, "Not showing messages targetted to free users to Pro users", diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/activity/FreeKassaActivity.kt b/android/app/src/main/kotlin/org/getlantern/lantern/activity/FreeKassaActivity.kt index 10ebb48e8..fb29a19bc 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/activity/FreeKassaActivity.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/activity/FreeKassaActivity.kt @@ -47,7 +47,7 @@ open class FreeKassaActivity : BaseFragmentActivity() { @ViewById @JvmField - protected var progressBar: ProgressBar? = null; + protected var progressBar: ProgressBar? = null @Extra @JvmField diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/activity/WebViewActivity.kt b/android/app/src/main/kotlin/org/getlantern/lantern/activity/WebViewActivity.kt index 2f33d537c..fb545dea0 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/activity/WebViewActivity.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/activity/WebViewActivity.kt @@ -47,7 +47,7 @@ open class WebViewActivity : BaseFragmentActivity() { } private fun hideProgressDialog() { - dialog?.let { if (it.isShowing()) it.dismiss() } + dialog?.let { if (it.isShowing) it.dismiss() } } private fun openWebview(url: String) { @@ -69,16 +69,16 @@ open class WebViewActivity : BaseFragmentActivity() { } }) val settings = webView.getSettings() - settings.setLoadWithOverviewMode(true) - settings.setUseWideViewPort(true) - settings.setJavaScriptEnabled(true) - settings.setPluginState(PluginState.ON) + settings.loadWithOverviewMode = true + settings.useWideViewPort = true + settings.javaScriptEnabled = true + settings.pluginState = PluginState.ON settings.setSupportZoom(false) webView.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY) webView.loadUrl(url) } - public fun closeWebView(view: View) { + fun closeWebView(view: View) { finish() } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/fragment/ProgressDialogFragment.kt b/android/app/src/main/kotlin/org/getlantern/lantern/fragment/ProgressDialogFragment.kt index 07ea40015..bd75f404c 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/fragment/ProgressDialogFragment.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/fragment/ProgressDialogFragment.kt @@ -10,7 +10,7 @@ open class ProgressDialogFragment : DialogFragment() { @NonNull override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { - val msgId: Int? = getArguments()?.getInt("msgId") + val msgId: Int? = arguments?.getInt("msgId") val dialog = ProgressDialog(requireContext()) if (msgId != null) dialog.setMessage(getString(msgId)) return dialog diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/AccountInitializationStatus.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/AccountInitializationStatus.kt index 380767a5e..a9eb1d724 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/model/AccountInitializationStatus.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/AccountInitializationStatus.kt @@ -1,6 +1,6 @@ package org.getlantern.lantern.model -data class AccountInitializationStatus(val status: AccountInitializationStatus.Status) { +data class AccountInitializationStatus(val status: Status) { enum class Status { PROCESSING, SUCCESS, FAILURE diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/InAppBilling.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/InAppBilling.kt index 2934f5d91..5dc6a4559 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/model/InAppBilling.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/InAppBilling.kt @@ -66,7 +66,7 @@ class InAppBilling( it.startConnection( object : BillingClientStateListener { override fun onBillingSetupFinished(billingResult: BillingResult) { - val responseCode = billingResult.getResponseCode() + val responseCode = billingResult.responseCode Logger.d(TAG, "onBillingSetupFinished with response code: $responseCode") if (billingResult.responseCodeOK()) { updateSkus() @@ -128,7 +128,7 @@ class InAppBilling( launchBillingFlow(activity, params) .takeIf { billingResult -> !billingResult.responseCodeOK() } ?.let { result -> - Logger.e(TAG, "Unexpected response code trying to launch billing flow: ${result.getResponseCode()}") + Logger.e(TAG, "Unexpected response code trying to launch billing flow: ${result.responseCode}") } } } @@ -164,11 +164,11 @@ class InAppBilling( plans.clear() skus.clear() skuDetailsList?.forEach { - val currency = it.getPriceCurrencyCode().lowercase() - val id = it.getSku() - val years = it.getSku().substring(0, 1) - val price = it.getPriceAmountMicros() / 10000 - val priceWithoutTax = it.getOriginalPriceAmountMicros() / 10000 + val currency = it.priceCurrencyCode.lowercase() + val id = it.sku + val years = it.sku.substring(0, 1) + val price = it.priceAmountMicros / 10000 + val priceWithoutTax = it.originalPriceAmountMicros / 10000 plans.put( id, ProPlan( @@ -251,8 +251,8 @@ class InAppBilling( } private fun isRetriable(billingResult: BillingResult): Boolean { - val responseCode = billingResult.getResponseCode() - val message = billingResult.getDebugMessage() + val responseCode = billingResult.responseCode + val message = billingResult.debugMessage return when (responseCode) { BillingClient.BillingResponseCode.SERVICE_TIMEOUT, BillingClient.BillingResponseCode.SERVICE_UNAVAILABLE, diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt index da386801a..37a69c17e 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/LanternSessionManager.kt @@ -294,8 +294,8 @@ class LanternSessionManager(application: Application) : SessionManager(applicati if (user.isProUser) { EventBus.getDefault().post(UserStatus(user.isActive, user.monthsLeft().toLong())) - prefs.edit().putInt(PRO_MONTHS_LEFT, user.monthsLeft() ?: 0) - .putInt(PRO_DAYS_LEFT, user.daysLeft() ?: 0) + prefs.edit().putInt(PRO_MONTHS_LEFT, user.monthsLeft()) + .putInt(PRO_DAYS_LEFT, user.daysLeft()) .apply() } } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/ProError.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProError.kt index 31a63a8e1..02522407a 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/model/ProError.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProError.kt @@ -11,7 +11,5 @@ data class ProError( result.get("errorId").asString, result.get("error").asString, result.get("details").asJsonObject, - ) { - - } + ) } \ No newline at end of file diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/model/ProUser.kt b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProUser.kt index 1c3e72cce..b207f89fc 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/model/ProUser.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/model/ProUser.kt @@ -23,13 +23,13 @@ data class ProUser( fun monthsLeft(): Int { val expDate = expirationDate() if (expDate == null) return 0 - return Months.monthsBetween(LocalDateTime.now(), expDate).getMonths() + return Months.monthsBetween(LocalDateTime.now(), expDate).months } fun daysLeft(): Int { val expDate = expirationDate() if (expDate == null) return 0 - return Days.daysBetween(LocalDateTime.now(), expDate).getDays() + return Days.daysBetween(LocalDateTime.now(), expDate).days } fun newUserDetails(): String { diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/notification/NotificationHelper.kt b/android/app/src/main/kotlin/org/getlantern/lantern/notification/NotificationHelper.kt index 8367b89da..6c20fea45 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/notification/NotificationHelper.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/notification/NotificationHelper.kt @@ -76,11 +76,11 @@ class NotificationHelper( } - public fun vpnConnectedNotification() { + fun vpnConnectedNotification() { manager.notify(VPN_CONNECTED, vpnBuilder.build()) } - public fun dataUsageNotification() { + fun dataUsageNotification() { manager.notify(DATA_USAGE, dataUsageBuilder.build()) } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/notification/NotificationReceiver.kt b/android/app/src/main/kotlin/org/getlantern/lantern/notification/NotificationReceiver.kt index d2cc1736e..7c0e12128 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/notification/NotificationReceiver.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/notification/NotificationReceiver.kt @@ -14,7 +14,7 @@ import org.getlantern.mobilesdk.Logger import org.greenrobot.eventbus.EventBus -class NotificationReceiver() : BroadcastReceiver() { +class NotificationReceiver : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { Logger.debug(TAG, "Received disconnect broadcast") val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleClient.kt b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleClient.kt index 0f73811bf..433ef5512 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleClient.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/plausible/PlausibleClient.kt @@ -202,7 +202,7 @@ internal class NetworkFirstPlausibleClient( Proxy.Type.HTTP, InetSocketAddress( "127.0.0.1", - uri.getPort(), + uri.port, ), ) OkHttpClient.Builder().proxy(proxy).build() diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/service/AutoStarter.kt b/android/app/src/main/kotlin/org/getlantern/lantern/service/AutoStarter.kt index 0c724f126..7613ba662 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/service/AutoStarter.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/service/AutoStarter.kt @@ -8,9 +8,9 @@ import org.getlantern.mobilesdk.Logger open class AutoStarter : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { - Logger.d(TAG, "Automatically starting Lantern Service on: ${intent.getAction()}") + Logger.d(TAG, "Automatically starting Lantern Service on: ${intent.action}") val serviceIntent = Intent(context, LanternService_::class.java) - .putExtra(LanternService.AUTO_BOOTED, intent.getAction() == Intent.ACTION_BOOT_COMPLETED) + .putExtra(LanternService.AUTO_BOOTED, intent.action == Intent.ACTION_BOOT_COMPLETED) context.startService(serviceIntent) } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt b/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt index a55cd84b1..d912d0992 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/service/LanternService.kt @@ -39,7 +39,7 @@ open class LanternService : Service(), Runnable { private const val MAX_CREATE_USER_TRIES = 11 private const val baseWaitMs = 3000 private val lanternClient: LanternHttpClient = LanternApp.getLanternHttpClient() - public val AUTO_BOOTED = "autoBooted" + val AUTO_BOOTED = "autoBooted" } private var thread: Thread? = null diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/ActivityExt.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/ActivityExt.kt index 324778773..1147af1e3 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/util/ActivityExt.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/ActivityExt.kt @@ -46,7 +46,7 @@ fun Activity.restartApp() { PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE ) val mgr: AlarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager - mgr.set(AlarmManager.RTC, java.lang.System.currentTimeMillis() + 100, mPendingIntent) + mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, mPendingIntent) Process.killProcess(Process.myPid()) } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/ApkInstaller.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/ApkInstaller.kt index 24ea80b4b..f329335d2 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/util/ApkInstaller.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/ApkInstaller.kt @@ -55,7 +55,7 @@ class ApkInstaller( private suspend fun installWithPackageInstaller() = withContext(Dispatchers.IO) { try { - val params = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL) + val params = SessionParams(SessionParams.MODE_FULL_INSTALL) // create a new session using the given params, returning a unique ID that represents the session val sessionId = packageInstaller.createSession(params) // open an existing session to actively perform work @@ -106,7 +106,7 @@ class ApkInstaller( Logger.error(TAG, "Failed to launch apk installer", e) } - private fun createInstallIntentContentUri(): Intent? { + private fun createInstallIntentContentUri(): Intent { val packageName = context.packageName val authority = "$packageName.fileProvider" val apkFileUri = FileProvider.getUriForFile(context, authority, apkFile) diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/ApkSignatureVerifier.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/ApkSignatureVerifier.kt index 18d5fa8e6..35cb3bc91 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/util/ApkSignatureVerifier.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/ApkSignatureVerifier.kt @@ -117,7 +117,7 @@ object ApkSignatureVerifier { // also this class calls [bytes2Hex] and with that proceeds to return a value which has their representation // as a signed string. // refers: https://stackoverflow.com/questions/5578871/how-to-get-apk-signing-signature - @kotlin.jvm.JvmStatic + @JvmStatic fun sha256(data: ByteArray?): String { var value = "" if (data == null || data.isEmpty()) { diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/DeviceInfo.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/DeviceInfo.kt index f9aa2e2db..a5786f4ff 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/util/DeviceInfo.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/DeviceInfo.kt @@ -13,7 +13,7 @@ object DeviceInfo : internalsdk.DeviceInfo { } override fun sdkVersion(): Long { - return android.os.Build.VERSION.SDK_INT.toLong() ?: 0 + return android.os.Build.VERSION.SDK_INT.toLong() } override fun deviceID(): String { diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternHttpClient.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternHttpClient.kt index c1ece03b2..74edce600 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternHttpClient.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternHttpClient.kt @@ -15,6 +15,7 @@ import okhttp3.MediaType import okhttp3.MediaType.Companion.toMediaTypeOrNull import okhttp3.Request import okhttp3.RequestBody +import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.Response import org.getlantern.lantern.LanternApp import org.getlantern.mobilesdk.Logger @@ -238,7 +239,7 @@ open class LanternHttpClient : HttpClient() { error: ProError?, ) - abstract fun onSuccess( + fun onSuccess( response: Response?, result: JsonObject?, ) @@ -300,7 +301,7 @@ open class LanternHttpClient : HttpClient() { } fun createJsonBody(json: JsonObject): RequestBody { - return RequestBody.create(JSON, json.toString()) + return json.toString().toRequestBody(JSON) } } } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternProxySelector.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternProxySelector.kt index 1ebb81741..0664740d5 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternProxySelector.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/LanternProxySelector.kt @@ -14,10 +14,10 @@ class LanternProxySelector(private val session: LanternSessionManager) : ProxySe setDefault(this) } - override fun select(uri: URI): MutableList? { + override fun select(uri: URI): MutableList { val proxyAddress: SocketAddress = addrFromString( - session.settings.getHttpProxyHost() + ":" + - session.settings.getHttpProxyPort(), + session.settings.httpProxyHost + ":" + + session.settings.httpProxyPort, ) val proxiesList: MutableList = mutableListOf() proxiesList.add(Proxy(Proxy.Type.HTTP, proxyAddress)) @@ -30,7 +30,7 @@ class LanternProxySelector(private val session: LanternSessionManager) : ProxySe private fun addrFromString(addr: String): InetSocketAddress { try { val uri: URI = URI("my://$addr") - return InetSocketAddress(uri.getHost(), uri.getPort()) + return InetSocketAddress(uri.host, uri.port) } catch (e: Exception) { throw RuntimeException(e) } diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/PermissionUtil.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/PermissionUtil.kt index cbfb5f786..fe3d74ce2 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/util/PermissionUtil.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/PermissionUtil.kt @@ -9,7 +9,7 @@ import org.getlantern.mobilesdk.Logger class PermissionUtil { companion object { private val TAG = PermissionUtil::class.java.simpleName - private val PERMISSIONS_TAG = "${PermissionUtil.TAG}.permissions" + private val PERMISSIONS_TAG = "$TAG.permissions" /*Note - we do not include Manifest.permission.FOREGROUND_SERVICE because this is automatically diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/PlansUtil.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/PlansUtil.kt index 7cc946bea..bc935477b 100644 --- a/android/app/src/main/kotlin/org/getlantern/lantern/util/PlansUtil.kt +++ b/android/app/src/main/kotlin/org/getlantern/lantern/util/PlansUtil.kt @@ -22,12 +22,12 @@ object PlansUtil { activity.resources.getString(R.string.discount, Math.round(plan.discount * 100).toString()) } val oneMonthCost = plan.formattedPriceOneMonth - plan.setRenewalText(proRenewalText(activity.resources, formattedBonus)) - plan.setTotalCostBilledOneTime(totalCostBilledOneTime) - plan.setOneMonthCost(oneMonthCost) - plan.setFormattedBonus(formattedBonus) + plan.renewalText = proRenewalText(activity.resources, formattedBonus) + plan.totalCostBilledOneTime = totalCostBilledOneTime + plan.oneMonthCost = oneMonthCost + plan.formattedBonus = formattedBonus plan.setFormattedDiscount(formattedDiscount) - plan.setTotalCost(totalCost) + plan.totalCost = totalCost } private fun proRenewalText(resources: Resources, formattedBonus: String): String { @@ -72,7 +72,7 @@ object PlansUtil { } return TextUtils.join(" ", bonusParts) } else { - return activity.resources.getQuantityString(R.plurals.day, (bonusMonths!! * 30 + bonusDays!!), (bonusMonths!! * 30 + bonusDays!!)) + return activity.resources.getQuantityString(R.plurals.day, (bonusMonths!! * 30 + bonusDays!!), (bonusMonths * 30 + bonusDays)) } } }