Changeset 609

Timestamp:

01/15/10 22:37:04 (2 years ago)

Author:

octorian

Message:

Fix for compilation issues against 4.5+ API versions

Location:

trunk

Files:

• LogicMail/src/org/logicprobe/LogicMail/util/ConnectionBB42.java (modified) (3 diffs)
• LogicMail/src/org/logicprobe/LogicMail/util/UtilFactory.java (modified) (1 diff)
• LogicMail_BB46/src/org/logicprobe/LogicMail/util (added)
• LogicMail_BB46/src/org/logicprobe/LogicMail/util/ConnectionBB46.java (added)
• LogicMail_BB46/src/org/logicprobe/LogicMail/util/UtilFactoryBB46.java (added)

trunk/LogicMail/src/org/logicprobe/LogicMail/util/ConnectionBB42.java

@@ -50 +50 @@
     private ServiceRecord srMDS, srWAP2, srWiFi;
     /** Flags indicating the coverage status of each transport */
-    private boolean coverageTCP=false, coverageMDS=false, coverageWAP2=false, coverageWiFi=false;
+    protected boolean coverageTCP=false, coverageMDS=false, coverageWAP2=false, coverageWiFi=false;
 
     private int transportSelection = TRANSPORT_AUTO;
@@ -119 +119 @@
                 }
             }   
-        }       
+        }
+        
+        initializeCoverage();
+    }
+
+    /**
+     * Coverage check APIs change on different OS versions, so this method
+     * exists to allow subclasses to override as necessary.
+     */
+    protected void initializeCoverage() {
         if(CoverageInfo.isCoverageSufficient(CoverageInfo.COVERAGE_CARRIER)){
             coverageTCP=true;
@@ -130 +139 @@
             coverageWiFi = true;
         }
-    }   
-
+    }
+    
     private StreamConnection attemptWiFi(String urlBase) {
         String connectStr = urlBase + ";interface=wifi";

trunk/LogicMail/src/org/logicprobe/LogicMail/util/UtilFactory.java

@@ -49 +49 @@
         "org.logicprobe.LogicMail.util.UtilFactoryBB50",
         "org.logicprobe.LogicMail.util.UtilFactoryBB47",
+        "org.logicprobe.LogicMail.util.UtilFactoryBB46",
         "org.logicprobe.LogicMail.util.UtilFactoryBB42"
     };