version 1.05(9) uploaded to Google Play into production

Author: JohnPalmer

Tigatrapp2.0dev/src/ceab/movelab/tigabib/Report.java

@@ -495,9 +495,14 @@ public int upload(Context context) {
 					result = UPLOADED_REPORT_ONLY;
 					Util.logInfo(context, TAG, "statusCode1: " + statusCode1);
 					result = uploadPhotos(context);
+				} else if(statusCode1 == 400){
+					// mark report as uploaded because in any case there is no point in sending it back to server.
+					result = UPLOADED_REPORT_ONLY;
+					Util.logInfo(context, TAG, "statusCode1: " + statusCode1);
+					result = uploadPhotos(context);
 				} else {
 					Util.logError(context, TAG, "fail upload, status code: "
-							+ this.uploaded);
+							+ statusCode1 + "uploaded: " + this.uploaded);
 
 					Util.logError(context, TAG, "failed to upload report: "
 							+ this.exportJSON(context).toString());

Tigatrapp2.0dev/src/ceab/movelab/tigabib/Util.java

@@ -778,8 +778,8 @@ public static int postPhoto(Context context, String uri, String filename,
 			// Don't use a cached copy.
 			conn.setUseCaches(false);
 			// set timeout
-			conn.setConnectTimeout(60000);
-			conn.setReadTimeout(60000);
+			conn.setConnectTimeout(240000);
+			conn.setReadTimeout(240000);
 			// Use a post method.
 			conn.setRequestMethod("POST");
 			// conn.setRequestProperty("Connection", "Keep-Alive");

tigatrapp/Tigatrapp/AndroidManifest.xml

@@ -22,8 +22,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ceab.movelab.tigatrapp"
-    android:versionCode="8"
-    android:versionName="1.04" >
+    android:versionCode="9"
+    android:versionName="1.05" >
 
     <uses-sdk
         android:minSdkVersion="4"

tigatrapp/Tigatrapp/res/values/strings.xml

@@ -2,7 +2,7 @@
 
     <string name="app_name" translatable="false">Tigatrapp</string>
     <string name="app_directory" translatable="false">Tigatrapp</string>
-    <string name="debug_mode" translatable="false">true</string>
+    <string name="debug_mode" translatable="false">false</string>
     <string name="private_mode" translatable="false">false</string>
     <string name="package_prefix" translatable="false">ceab.movelab.tigatrapp.</string>
     <string name="content_provider_auth_missions" translatable="false">ceab.movelab.tigatrapp.cp.missions</string>