From 22c20687f3a8e5e8170a924c03b25e1307ea8877 Mon Sep 17 00:00:00 2001 From: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com> Date: Tue, 21 Apr 2020 14:23:02 +0200 Subject: [PATCH] Converted Config Utils to Kotlin (#3674) * Converted Config Utils to Kotlin * Changes made as per suggestion * Omitted this --- .../free/nrw/commons/utils/ConfigUtils.java | 27 ------------------- .../fr/free/nrw/commons/utils/ConfigUtils.kt | 24 +++++++++++++++++ 2 files changed, 24 insertions(+), 27 deletions(-) delete mode 100644 app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.java create mode 100644 app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.java b/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.java deleted file mode 100644 index 409886715..000000000 --- a/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.java +++ /dev/null @@ -1,27 +0,0 @@ -package fr.free.nrw.commons.utils; - -import android.content.Context; -import android.content.pm.PackageManager; - -import java.util.Locale; - -import fr.free.nrw.commons.BuildConfig; - -public class ConfigUtils { - - public static boolean isBetaFlavour() { - return BuildConfig.FLAVOR.equals("beta"); - } - - private static String getVersionName(Context context) { - try { - return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName; - } catch (PackageManager.NameNotFoundException e) { - return BuildConfig.VERSION_NAME; - } - } - - public static String getVersionNameWithSha(Context context) { - return String.format(Locale.getDefault(), "%s~%s", getVersionName(context), BuildConfig.COMMIT_SHA); - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt b/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt new file mode 100644 index 000000000..539c9246e --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt @@ -0,0 +1,24 @@ +package fr.free.nrw.commons.utils + +import android.content.Context +import android.content.pm.PackageManager +import fr.free.nrw.commons.BuildConfig + +object ConfigUtils { + @JvmStatic + val isBetaFlavour: Boolean = BuildConfig.FLAVOR == "beta" + + @JvmStatic + private fun Context.getVersionName(): String { + return try { + packageManager.getPackageInfo(packageName, 0).versionName + } catch (e: PackageManager.NameNotFoundException) { + BuildConfig.VERSION_NAME + } + } + + @JvmStatic + fun Context.getVersionNameWithSha(): String { + return "${getVersionName()}~${BuildConfig.COMMIT_SHA}" + } +} \ No newline at end of file