Changeset 611

Timestamp:

01/15/10 23:31:04 (2 years ago)

Author:

octorian

Message:

Fix for a few goofs

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• conf/GlobalConfig.java (modified) (1 diff)
• util/ConnectionBB42.java (modified) (2 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/GlobalConfig.java

@@ -385 +385 @@
             }
         }
-        value = table.get("account_transportType");
+        value = table.get("global_transportType");
         if(value instanceof Integer) {
             transportType = ((Integer)value).intValue();
         }
-        value = table.get("account_enableWiFi");
+        value = table.get("global_enableWiFi");
         if(value instanceof Boolean) {
             enableWiFi = ((Boolean)value).booleanValue();

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

@@ -52 +52 @@
     protected boolean coverageTCP=false, coverageMDS=false, coverageWAP2=false, coverageWiFi=false;
 
-    private int transportSelection = TRANSPORT_AUTO;
-    
     /**
      * Initializes a new connection object.
@@ -75 +73 @@
         
         StreamConnection connection = null;
-        if((transportSelection & TRANSPORT_WIFI) != 0 && srWiFi != null && coverageWiFi) {
+        if((transports & TRANSPORT_WIFI) != 0 && srWiFi != null && coverageWiFi) {
             connection = attemptWiFi(urlBase);
         }
-        if(connection == null && (transportSelection & TRANSPORT_DIRECT_TCP) != 0 && coverageTCP) {
+        if(connection == null && (transports & TRANSPORT_DIRECT_TCP) != 0 && coverageTCP) {
             connection = attemptDirectTCP(urlBase);
         }
-        if(connection == null && (transportSelection & TRANSPORT_MDS) != 0 && srMDS != null && coverageMDS) {
+        if(connection == null && (transports & TRANSPORT_MDS) != 0 && srMDS != null && coverageMDS) {
             connection = attemptMDS(urlBase);
         }
-        if(connection == null && (transportSelection & TRANSPORT_WAP2) != 0 && srWAP2 != null && coverageWAP2) {
+        if(connection == null && (transports & TRANSPORT_WAP2) != 0 && srWAP2 != null && coverageWAP2) {
             connection = attemptWAP2(urlBase);
         }