From d34bbb4a0dd2bbf76d0f8ed1eeefdbfe0e948a6f Mon Sep 17 00:00:00 2001 From: Petar Petrov Date: Wed, 12 Nov 2014 09:27:47 +0100 Subject: [PATCH] Update operator name change --- res/values/arrays.xml | 2 +- .../myglob/configuration/AccountPreferencesActivity.java | 5 +++-- src/net/vexelon/myglob/configuration/Defs.java | 2 +- src/net/vexelon/myglob/users/AccountType.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index f800c13..4dec822 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -4,5 +4,5 @@ Профил Относно - Globul + Telenor \ No newline at end of file diff --git a/src/net/vexelon/myglob/configuration/AccountPreferencesActivity.java b/src/net/vexelon/myglob/configuration/AccountPreferencesActivity.java index 61d4d7d..dd181e5 100644 --- a/src/net/vexelon/myglob/configuration/AccountPreferencesActivity.java +++ b/src/net/vexelon/myglob/configuration/AccountPreferencesActivity.java @@ -188,8 +188,9 @@ private boolean isSettingsValid() { private AccountType getAccountTypeFromListPrefs() { String[] operators = getResStringArray(R.array.array_available_operators); - if (_accountOperatorPref.getValue().equals(operators[0])) { - return AccountType.Globul; + String userOperator = _accountOperatorPref.getValue(); + if (userOperator.equals(operators[0]) || userOperator.equals("Globul")) { + return AccountType.Telenor; } // else if (_accountOperatorPref.getValue().equals(operators[1])) { // return AccountType.M_Tel; diff --git a/src/net/vexelon/myglob/configuration/Defs.java b/src/net/vexelon/myglob/configuration/Defs.java index e22a294..e25d7a5 100644 --- a/src/net/vexelon/myglob/configuration/Defs.java +++ b/src/net/vexelon/myglob/configuration/Defs.java @@ -26,7 +26,7 @@ public class Defs { public final static String LOG_TAG = "net.vexelon.myglob"; - public final static boolean LOG_ENABLED = true; + public final static boolean LOG_ENABLED = false; // Theming public final static int THEME = R.style.Theme_Sherlock; diff --git a/src/net/vexelon/myglob/users/AccountType.java b/src/net/vexelon/myglob/users/AccountType.java index 0861465..3c635ac 100644 --- a/src/net/vexelon/myglob/users/AccountType.java +++ b/src/net/vexelon/myglob/users/AccountType.java @@ -20,7 +20,7 @@ package net.vexelon.myglob.users; public enum AccountType { - Globul, + Telenor, M_Tel, Vivacom, }