dhis-mobile-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 164
committer: Long <Long@Long-Laptop>
branch nick: lwuit-tracking
timestamp: Wed 2013-10-09 15:56:22 +0700
message:
  check the internet connection status
modified:
  src/org/hisp/dhis/mobile/connection/task/GetAllAnonymousProgramTask.java
  src/org/hisp/dhis/mobile/ui/Text.java


--
lp:~dhis-mobile-devs/dhis-mobile/lwuit-tracking
https://code.launchpad.net/~dhis-mobile-devs/dhis-mobile/lwuit-tracking

Your team DHIS mobile developers is subscribed to branch lp:~dhis-mobile-devs/dhis-mobile/lwuit-tracking.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis-mobile-devs/dhis-mobile/lwuit-tracking/+edit-subscription

=== modified file 'src/org/hisp/dhis/mobile/connection/task/GetAllAnonymousProgramTask.java'
--- src/org/hisp/dhis/mobile/connection/task/GetAllAnonymousProgramTask.java	2013-10-03 08:31:21 +0000
+++ src/org/hisp/dhis/mobile/connection/task/GetAllAnonymousProgramTask.java	2013-10-09 08:56:22 +0000
@@ -35,6 +35,7 @@
 import org.hisp.dhis.mobile.midlet.NameBasedMIDlet;
 import org.hisp.dhis.mobile.model.Program;
 import org.hisp.dhis.mobile.model.ProgramStage;
+import org.hisp.dhis.mobile.ui.Text;
 
 /**
  * @author Nguyen Kim Lai
@@ -45,9 +46,9 @@
     extends AbstractTask
 {
     String programType;
-    
+
     boolean isLostToFollowUp;
-    
+
     NameBasedMIDlet nameBasedMIDlet;
 
     public GetAllAnonymousProgramTask( String programType, boolean isLostToFollowUp )
@@ -65,29 +66,30 @@
             dataInputStream = this.download( programType, "programType" );
             Program program = new Program();
             program.deSerialize( dataInputStream );
-            
+
             // Anonymous is 3
             if ( programType.equals( "3" ) )
             {
                 ProgramStage programStage = (ProgramStage) program.getProgramStages().elementAt( 0 );
-                
+
                 nameBasedMIDlet.getTrackingDataEntryView().setProgramStage( programStage );
                 nameBasedMIDlet.getTrackingDataEntryView().setTitle( program.getName() );
                 nameBasedMIDlet.getTrackingDataEntryView().showView();
                 programStage = null;
             }
-            // Multiple events with registration is 1, or lost to follow up events
+            // Multiple events with registration is 1, or lost to follow up
+            // events
             else
             {
                 Vector programInfos = new Vector();
-                programInfos.addElement( program.getId()+"/"+program.getName() );
+                programInfos.addElement( program.getId() + "/" + program.getName() );
                 nameBasedMIDlet.getProgramSelectView().setProgramInfos( programInfos );
                 programInfos = null;
                 nameBasedMIDlet.getProgramSelectView().setProgramType( programType );
                 nameBasedMIDlet.getProgramSelectView().setLostToFollowUp( isLostToFollowUp );
                 nameBasedMIDlet.getProgramSelectView().showView();
             }
-            
+
             dataInputStream = null;
             programType = null;
             program = null;
@@ -95,15 +97,21 @@
         }
         catch ( IOException e )
         {
+
             DHISMIDlet.debug( e.getMessage() );
             e.printStackTrace();
             String message = null;
-            
+
             message = e.getMessage();
-            
-            if ( message.equalsIgnoreCase( "NO_PROGRAM_FOUND" ) )
-            {
-                nameBasedMIDlet.getAlertBoxView( "No program found for "+nameBasedMIDlet.getCurrentOrgUnit().getName(), "Opps" ).showView();
+            if ( e.getMessage().equalsIgnoreCase( Text.HTTP_ERROR() ) )
+            {
+                nameBasedMIDlet.getAlertBoxView( "Internet is not available, Please try againt later.", "Alert" ).showView();
+                nameBasedMIDlet.getTrackingMainMenuView().showView();
+            }
+            else if ( message.equalsIgnoreCase( "NO_PROGRAM_FOUND" ) )
+            {
+                nameBasedMIDlet.getAlertBoxView(
+                    "No program found for " + nameBasedMIDlet.getCurrentOrgUnit().getName(), "Opps" ).showView();
                 nameBasedMIDlet.getOrgUnitSelectView().setProgramType( programType );
                 nameBasedMIDlet.getOrgUnitSelectView().showView();
             }
@@ -115,14 +123,15 @@
                     programInfos.addElement( message.substring( 0, message.indexOf( "$" ) ) );
                     message = message.substring( message.indexOf( "$" ) + 1, message.length() );
                 }
-                
+
                 // Anonymous is 3
                 if ( programType.equals( "3" ) )
                 {
                     nameBasedMIDlet.getAnonymousProgramListView().setAnonymousProgramInfos( programInfos );
                     nameBasedMIDlet.getAnonymousProgramListView().showView();
                 }
-                // Multiple events with registration is 1, or lost to follow up events
+                // Multiple events with registration is 1, or lost to follow up
+                // events
                 else
                 {
                     nameBasedMIDlet.getProgramSelectView().setProgramInfos( programInfos );
@@ -130,7 +139,7 @@
                     nameBasedMIDlet.getProgramSelectView().setLostToFollowUp( isLostToFollowUp );
                     nameBasedMIDlet.getProgramSelectView().showView();
                 }
-                
+
                 message = null;
                 programInfos = null;
             }
@@ -139,6 +148,5 @@
             System.gc();
         }
     }
-    
-    
+
 }

=== modified file 'src/org/hisp/dhis/mobile/ui/Text.java'
--- src/org/hisp/dhis/mobile/ui/Text.java	2013-09-07 13:31:02 +0000
+++ src/org/hisp/dhis/mobile/ui/Text.java	2013-10-09 08:56:22 +0000
@@ -769,4 +769,8 @@
     public static String ADD_PERSON(){
         return get((short) 142, "Add Person");
     }
+    
+    public static String HTTP_ERROR(){
+        return get((short) 143, "Error in HTTP operation");
+    }
 }