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 /app/src/main/java/foundation/e/privacycentralapp/common | |
| parent | 9701ef06a47560ca429f1e7fffd0958b376ec628 (diff) | |
| parent | fdeecefd34c00b225bd58f6cc7135a95e21728f1 (diff) | |
| download | advanced-privacy-99b27efb59ba642bfca0c6fbabfaa2c6631e15b9.tar.gz | |
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 'app/src/main/java/foundation/e/privacycentralapp/common')
| -rw-r--r-- | app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt | 2 | ||||
| -rw-r--r-- | app/src/main/java/foundation/e/privacycentralapp/common/extensions/AnyExtension.kt | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt b/app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt index 25a3633..d85f4a7 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt @@ -60,4 +60,4 @@ private fun asteriskAsInfoIconSpannable( } } return spannable -}
\ No newline at end of file +} diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/extensions/AnyExtension.kt b/app/src/main/java/foundation/e/privacycentralapp/common/extensions/AnyExtension.kt index 5c73df9..71de99a 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/common/extensions/AnyExtension.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/common/extensions/AnyExtension.kt @@ -19,10 +19,4 @@ package foundation.e.privacycentralapp.common.extensions import android.content.Context -fun Any.toText(context: Context) = when (this) { - is Int -> context.getString(this) - is String -> this - else -> this.toString() -} - fun Int.dpToPxF(context: Context): Float = this.toFloat() * context.resources.displayMetrics.density |