Changeset 33 for mymrc

Timestamp:

07/22/07 13:18:09 (5 years ago)

Author:

ciro

Message:

Fixed bugs: Application crash (NullPointerException?) after closing Settings
and About dialog, and when closing the application

Location:

mymrc/trunk/Java-client

Files:

• dist/myMRC.jad (modified) (1 diff)
• dist/myMRC.jar (modified) (previous)
• src/org/myMRC/control/Controller.java (modified) (4 diffs)
• src/org/myMRC/events/Content.java (modified) (1 diff)
• src/org/myMRC/myMRC.java (modified) (1 diff)
• src/org/myMRC/net/BluetoothController.java (modified) (4 diffs)

mymrc/trunk/Java-client/dist/myMRC.jad

@@ -1 +1 @@
 MIDlet-1: myMRC,,org.myMRC.myMRC
 MIDlet-Icon: /images/icon.png
-MIDlet-Jar-Size: 80055
+MIDlet-Jar-Size: 79683
 MIDlet-Jar-URL: myMRC.jar
 MIDlet-Name: myMRC

mymrc/trunk/Java-client/src/org/myMRC/control/Controller.java

@@ -225 +225 @@
         switch (opcode) {
             case Opcode.IOP_START:
-                if (!communicator.isAlive()) {
-                    this.handle(Opcode.IOP_PARSEFORM, Content.CONT_START);
-                } else {
-                    this.handle(Opcode.IOP_PARSEFORM, Content.CONT_START_CONNECTED);
-                }
-                
+                this.handle(Opcode.IOP_PARSEFORM, Content.CONT_START);
                 break;
                 
@@ -237 +232 @@
                     case Settings.CONN_BLUETOOTH:
                         this.communicator = BluetoothController.getInstance();
+                        BluetoothController.getInstance().getDevices();
                         break;
                         
@@ -302 +298 @@
                 
             case Opcode.IOP_SETTINGS_SAVE:
-                //config.writeSettings(form);
                 try {
                     config.setFromForm(form);
@@ -322 +317 @@
                 
             case Opcode.IOP_INT_EXIT:
-                if (communicator.isAlive()) {
+                if (communicator != null && communicator.isAlive()) {
                     try {
-                    communicator.close(); // FIXME: does it work?
+                    communicator.close();
                     } catch (IOException ioe) {
                         ioe.printStackTrace();

mymrc/trunk/Java-client/src/org/myMRC/events/Content.java

@@ -42 +42 @@
             "   <command type=\"back\" label=\"Exit\" opcode=\"0" + Opcode.IOP_INT_EXIT_CONF + "\"/>" +
             "</form>";
-            
-    public static final String CONT_START_CONNECTED = 
-            "<form label=\"myMRC 0.1\">" + 
-            "   <image file=\"mymrc.png\"/>" +
-            "   <string label=\"OH OH! this is deprecated, it shouldn't be displayed\"/>" +
-            "   <command label=\"Continue\" opcode=\"0000\"/>" +
-            "   <command label=\"Disconnect\" opcode=\"0991\"/>" +
-            "   <command label=\"Settings\" opcode=\"0920\"/>" +
-            "   <command label=\"About\" opcode=\"0901\"/>" +
-            "   <command label=\"Exit\" opcode=\"0998\"/>" +
-            "   <command type=\"back\" label=\"Exit\" opcode=\"0998\"/>" +
-            "</form>";
     
     public static final String CONT_SETTINGS = 

mymrc/trunk/Java-client/src/org/myMRC/myMRC.java

@@ -41 +41 @@
      */
     public void exitMIDlet() {
-        try {
-            if (InetController.getInstance().isAlive()) {
-                InetController.getInstance().close();
-            }
-            if (BluetoothController.getInstance().isAlive()) {
-                BluetoothController.getInstance().close();
-            }
-        } catch (IOException ioe) {
-            /* 
-             * well, not much we can do here, exiting anyway, will just keep
-             * the socket open for some more time
-             */
-        }
-        
-        //InetController.getInstance().destroy();
-        
         Display.getDisplay(this).setCurrent(null);
         destroyApp(true);

mymrc/trunk/Java-client/src/org/myMRC/net/BluetoothController.java

@@ -51 +51 @@
     private BluetoothController() {
         this.controller = Controller.getInstance();
-        this.getDevices();
+        //this.getDevices();
     }
     
@@ -105 +105 @@
      * Scans for available Bluetooth devices.
      */
-    private void getDevices() {
+    public void getDevices() {
         try {
             this.local = LocalDevice.getLocalDevice();
@@ -415 +415 @@
             super.receiver = new Receiver(this, conn.openInputStream());
             super.receiver.start();
-            //ostream.write("whoohoo\n".getBytes());
-            //ostream.flush();
             super.isAlive = true;
             super.send(Opcode.OP_HELLO, null);
-            //istream = conn.openInputStream();
-            //int size = 197;
-            //byte[] b = new byte[size];
-            //istream.read(b, 0, size);
-            //controller.handle(Opcode.IOP_PARSELIST, new String(b));
+            
         } catch (IOException ioe) {
                 alert.setString("Connection failed: " + ioe.getMessage());
@@ -433 +427 @@
         }
         
-        //alert.setString("Connected to " + url + "   (conn = " + conn + ")");
-        //controller.setScreen(alert);
     }