started V1.3.11

fixed #14 - cancel current OBD service on NRC response (to prevent error loop)
fr3ts0n · Jan 8, 2016 · 31b68e8 · 31b68e8
1 parent c509985
commit 31b68e8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest
     package="com.fr3ts0n.ecu.gui.androbd"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="10309"
+    android:versionCode="10311"
     android:versionName="@string/app_version">
 
     <uses-sdk

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <!--  AndrOBD -->
     <string name="app_name" translatable="false">AndrOBD</string>
-    <string name="app_version" translatable="false">V1.3.9</string>
+    <string name="app_version" translatable="false">V1.3.11</string>
     <string name="copyright_fr3ts0n" translatable="false">&#169; 2015 fr3ts0n</string>
     <string name="translation_credits">Translation by fr3ts0n</string>
     <string name="app_description">Android OBD vehicle diagnostics app for ELM327 bluetooth adapter</string>

diff --git a/src/com/fr3ts0n/ecu/gui/androbd/MainActivity.java b/src/com/fr3ts0n/ecu/gui/androbd/MainActivity.java
@@ -381,6 +381,7 @@ public void handleMessage(Message msg)
 					getListView().invalidateViews();
 					break;
 
+				// handle state change in OBD protocol
 				case MESSAGE_OBD_STATE_CHANGED:
 					evt = (PropertyChangeEvent) msg.obj;
 					ElmProt.STAT state = (ElmProt.STAT)evt.getNewValue();
@@ -399,17 +400,23 @@ public void handleMessage(Message msg)
 					}
 					break;
 
+				// handle change in number of fault codes
 				case MESSAGE_OBD_NUMCODES:
 					evt = (PropertyChangeEvent) msg.obj;
 					setNumCodes((Integer) evt.getNewValue());
 					break;
 
+				// handle ECU detection event
 				case MESSAGE_OBD_ECUS:
 					evt = (PropertyChangeEvent) msg.obj;
 					selectEcu((Set<Integer>) evt.getNewValue());
 					break;
 
+				// handle negative result code from OBD protocol
 				case MESSAGE_OBD_NRC:
+					// reset OBD mode to prevent infinite error loop
+					setObdService(ObdProt.OBD_SVC_NONE, getText(R.string.obd_error));
+					// show error dialog ...
 					evt = (PropertyChangeEvent) msg.obj;
 					String nrcMessage = (String)evt.getNewValue();
 					dlgBuilder