Update operator name change

vexelon-dot-net · Nov 12, 2014 · d34bbb4 · d34bbb4
1 parent 120872b
commit d34bbb4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
@@ -4,5 +4,5 @@
         <item >Профил</item>
         <item >Относно</item>
     </string-array>
-    <string-array name="array_available_operators"><item>Globul</item></string-array>
+    <string-array name="array_available_operators"><item>Telenor</item></string-array>
 </resources>
diff --git 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
@@ -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
@@ -20,7 +20,7 @@
 package net.vexelon.myglob.users;
 
 public enum AccountType {
-	Globul,
+	Telenor,
 	M_Tel,
 	Vivacom,
 }