From 6c0bc4e1ea51495cc0ccae445d6908bd9d0fe8aa Mon Sep 17 00:00:00 2001 From: X1nto Date: Tue, 22 Dec 2020 23:23:18 +0400 Subject: [PATCH] added a fallback for empty language list --- .../vanced/manager/ui/dialogs/VancedPreferencesDialog.kt | 9 +++++++++ .../main/java/com/vanced/manager/utils/LanguageHelper.kt | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt index 65d7bc82..181082d6 100644 --- a/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt +++ b/app/src/main/java/com/vanced/manager/ui/dialogs/VancedPreferencesDialog.kt @@ -4,6 +4,7 @@ import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.ViewGroup +import androidx.core.content.edit import com.vanced.manager.R import com.vanced.manager.core.ui.base.BindingBottomSheetDialogFragment import com.vanced.manager.core.ui.ext.showDialog @@ -67,6 +68,14 @@ class VancedPreferencesDialog : BindingBottomSheetDialogFragment context.getString(R.string.system_default) language.length > 2 -> { val loc = Locale( - language.substring(0, language.length - 3), - language.substring(language.length - 2) + language.substring(0, language.length - 3), + language.substring(language.length - 2) ) loc.getDisplayName(loc).capitalize(Locale.ENGLISH) } @@ -62,8 +62,8 @@ object LanguageHelper { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (!Settings.canDrawOverlays(this)) { val intent = Intent( - Settings.ACTION_MANAGE_OVERLAY_PERMISSION, - Uri.parse("package:$packageName") + Settings.ACTION_MANAGE_OVERLAY_PERMISSION, + Uri.parse("package:$packageName") ) startActivityForResult(intent, 69) return