Merge pull request #57 from xLaMbChOpSx/master

SIM Methods Exception Handling
CellularPrivacy · May 3, 2014 · c16dd16 · c16dd16
2 parents 247ece5 + 1af417d
commit c16dd16
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 13 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.SecUpwN.AIMSICD"
-    android:versionCode="6"
-    android:versionName="0.1.6" >
+    android:versionCode="13"
+    android:versionName="0.1.13" >
 
     <uses-feature
         android:glEsVersion="0x00020000"

diff --git a/app/src/main/java/com/SecUpwN/AIMSICD/service/AimsicdService.java b/app/src/main/java/com/SecUpwN/AIMSICD/service/AimsicdService.java
@@ -272,11 +272,11 @@ private void refreshDeviceInfo() {
         }*/
 
         //SIM Information
-        mSimCountry = tm.getSimCountryIso();
-        mSimOperator = tm.getSimOperator();
-        mSimOperatorName = tm.getSimOperatorName();
-        mSimSerial = tm.getSimSerialNumber();
-        mSimSubs = tm.getSubscriberId();
+        mSimCountry = getSimCountry(true);
+        mSimOperator = getSimOperator(true);
+        mSimOperatorName = getSimOperatorName(true);
+        mSimSerial = getSimSerial(true);
+        mSimSubs = getSimSubs(true);
 
         mDataActivityType = getActivityDesc();
         mDataState = getStateDesc();
@@ -355,7 +355,11 @@ public int getPhoneID() {
      */
     public String getSimCountry(boolean force) {
         if (mSimCountry.isEmpty() || force) {
-            mSimCountry = tm.getSimCountryIso();
+            try {
+                mSimCountry = tm.getSimCountryIso();
+            } catch (Exception e) {
+                //SIM methods can cause Exceptions on some devices
+            }
         }
 
         return mSimCountry;
@@ -368,7 +372,11 @@ public String getSimCountry(boolean force) {
      */
     public String getSimOperator(boolean force) {
         if (mSimOperator.isEmpty() || force) {
-            mSimOperator = tm.getSimOperator();
+            try {
+                mSimOperator = tm.getSimOperator();
+            } catch (Exception e) {
+                //SIM methods can cause Exceptions on some devices
+            }
         }
 
         return mSimOperator;
@@ -381,7 +389,11 @@ public String getSimOperator(boolean force) {
      */
     public String getSimOperatorName(boolean force) {
         if (mSimOperatorName.isEmpty() || force) {
-            mSimOperatorName = tm.getSimOperatorName();
+            try {
+                mSimOperatorName = tm.getSimOperatorName();
+            }catch (Exception e) {
+                //SIM methods can cause Exceptions on some devices
+            }
         }
 
         return mSimOperatorName;
@@ -394,7 +406,12 @@ public String getSimOperatorName(boolean force) {
      */
     public String getSimSubs(boolean force) {
         if (mSimSubs.isEmpty() || force) {
-            mSimSubs = tm.getSubscriberId();
+            try {
+                mSimSubs = tm.getSubscriberId();
+            } catch (Exception e) {
+                //Some devices don't like this method
+            }
+
         }
 
         return mSimSubs;
@@ -407,7 +424,11 @@ public String getSimSubs(boolean force) {
      */
     public String getSimSerial(boolean force) {
         if (mSimSerial.isEmpty() || force) {
-            mSimSerial = tm.getSimSerialNumber();
+            try {
+                mSimSerial = tm.getSimSerialNumber();
+            } catch (Exception e) {
+                //SIM methods can cause Exceptions on some devices
+            }
         }
 
         return mSimSerial;
@@ -484,7 +505,12 @@ public String getPhoneNumber(boolean force) {
 
         //Check if Phone Number successfully retrieved and if not try subscriber
         if (mPhoneNum.isEmpty())
-            mPhoneNum = tm.getSubscriberId();
+            try {
+                mPhoneNum = tm.getSubscriberId();
+            } catch (NullPointerException npe) {
+                //Seems some devices don't like this on either
+            }
+
 
         return mPhoneNum;
     }