Merge branch 'release/0.3.4'

HISTORY.md

@@ -1,5 +1,10 @@
 ## 0.3.3 (2001-03-27)
 
+* Improved GUI
+* Fixed minor errors on error messages
+
+## 0.3.3 (2001-03-27)
+
 * Redesigned GUI
 
 ## 0.3.2 (2011-03-24)

SWADroid/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="es.ugr.swad.swadroid"
-      android:installLocation="auto" android:versionName="0.3.3" android:versionCode="9">
-    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher_swadroid" android:debuggable="true">
+      android:installLocation="auto" android:versionCode="10" android:versionName="0.3.4">
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher_swadroid" android:debuggable="false">
          <activity android:name=".SWADMain"
                    android:label="@string/app_name"
                    android:icon="@drawable/ic_launcher_swadroid" android:configChanges="keyboard|keyboardHidden|orientation">

SWADroid/gen/es/ugr/swad/swadroid/R.java

@@ -21,8 +21,9 @@ public final class R {
         public static final int ic_launcher_swadroid=0x7f020004;
         public static final int note=0x7f020005;
         public static final int notif=0x7f020006;
-        public static final int recmsg=0x7f020007;
-        public static final int test=0x7f020008;
+        public static final int notif36x36=0x7f020007;
+        public static final int recmsg=0x7f020008;
+        public static final int test=0x7f020009;
     }
     public static final class id {
         public static final int eventDate=0x7f080004;
@@ -54,10 +55,13 @@ public final class R {
         public static final int coursesProgressDescription=0x7f060018;
         public static final int coursesProgressTitle=0x7f060017;
         public static final int dateMsg=0x7f060028;
+        public static final int errorConnectionMsg=0x7f06002e;
         public static final int errorCopyMsg_DB=0x7f06001b;
         public static final int errorMsgLaunchingActivity=0x7f060019;
         public static final int errorMsgNoConnection=0x7f06001c;
         public static final int errorMsgWorkaroundEmulator=0x7f06001a;
+        public static final int errorServerResponseMsg=0x7f06002d;
+        public static final int errorTimeoutMsg=0x7f06002f;
         public static final int examAnnouncement=0x7f060021;
         public static final int firstRunMsg=0x7f06002b;
         public static final int forumReply=0x7f060025;

SWADroid/res/layout/functions_list_item.xml

@@ -1,21 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="horizontal">
+  android:layout_height="wrap_content"
+  android:layout_width="match_parent"
+  android:orientation="horizontal"
+  android:background="#ffffff">
 
  <ImageView 
    android:id="@+id/functionIcon"
    android:layout_gravity="center_vertical"
    android:layout_width="wrap_content"
-   android:layout_height="wrap_content">
+   android:layout_height="wrap_content"
+   android:layout_marginLeft="6dip">
  </ImageView>
  
  <TextView
   android:id="@+id/functionText"
   android:layout_width="fill_parent"
   android:layout_height="wrap_content"
-  android:padding="20dp"
-  android:textColor="#ffffff"
+  android:padding="20dip"
+  android:textColor="#000000"
   android:textSize="24sp">
  </TextView>
 </LinearLayout>

SWADroid/res/layout/main.xml

@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"> 
+    android:layout_height="fill_parent"
+    android:background="#ffffff"> 
     
     <ListView
        	android:id="@+id/android:list"

SWADroid/res/layout/notifications.xml

@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
+    android:background="#ffffff">
     
     <Button
 		android:id="@+id/notificationsUpdateButton"

SWADroid/res/layout/notifications_list_item.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?> 
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="horizontal">
+  android:layout_height="wrap_content"
+  android:layout_width="match_parent"
+  android:orientation="horizontal"
+  android:background="#ffffff">
    
  <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
@@ -50,7 +53,7 @@
 		android:id="@+id/eventType"
 		android:layout_height="wrap_content"
 		android:layout_width="match_parent"
-  		android:textColor="#ffffff"
+  		android:textColor="#000000"
   		android:textSize="18sp"
   		android:textStyle="bold" />
 		
@@ -58,7 +61,7 @@
 		android:id="@+id/eventLocation"
 		android:layout_height="wrap_content"
 		android:layout_width="match_parent"
-  		android:textColor="#ffffff"
+  		android:textColor="#000000"
   		android:padding="1dip" />
 		
     <TextView
@@ -66,7 +69,7 @@
 		android:layout_height="wrap_content"
 		android:layout_width="match_parent"
     	android:singleLine="false"
-  		android:textColor="#ffffff"
+  		android:textColor="#000000"
   		android:textSize="16sp"
   		android:padding="2dip" />
  </LinearLayout>

SWADroid/res/values-es/strings.xml

@@ -33,5 +33,6 @@
 <string name="noMsg">No</string>
 <string name="firstRunMsg">Antes de usar la aplicación por primera vez debe introducir el nombre de usuario y la contraseña de acceso a SWAD en la pantalla de configuración.\n\nPuede acceder a la pantalla de configuración desde el menú de la aplicación en cualquier momento.\n\n¿Desea abrir ahora la pantalla de configuración?</string>
 <string name="initialDialogTitle">IMPORTANTE</string>
+<string name="errorServerResponseMsg">Error en respuesta del servidor</string><string name="errorConnectionMsg">Error durante la conexión con el servidor</string><string name="errorTimeoutMsg">Tiempo de espera agotado intentando conectar con el servidor</string>
 
 </resources>

SWADroid/res/values/strings.xml

@@ -35,7 +35,9 @@
 <string name="dateMsg">Date</string>
 <string name="yesMsg">Yes</string>
 <string name="noMsg">No</string><string name="firstRunMsg">Before using the application for the first time you must enter the user name and password for SWAD at the setup screen.\n\nYou can access to the setup screen from the application menu anytime.\n\nDo you want to open the configuration screen now?</string>
-<string name="initialDialogTitle">IMPORTANT</string>
+<string name="initialDialogTitle">IMPORTANT</string><string name="errorServerResponseMsg">Error in server response</string>
+<string name="errorConnectionMsg">Error while connecting to server</string>
+<string name="errorTimeoutMsg">Timeout trying to connect to the server</string>
 
 
 

SWADroid/src/es/ugr/swad/swadroid/modules/Module.java

@@ -43,6 +43,7 @@ import es.ugr.swad.swadroid.model.DataBaseHelper;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
+import java.util.concurrent.TimeoutException;
 
 import org.ksoap2.SoapEnvelope;
 import org.ksoap2.SoapFault;
@@ -566,6 +567,7 @@ public abstract class Module extends ListActivity {
     	 */
         @Override
         protected void onPostExecute(Void unused) {  
+        	String errorMsg;      	
         	Log.d(Global.MODULE_TAG, "onPostExecute()");
         	
         	if(dialog.isShowing()) {
@@ -581,6 +583,18 @@ public abstract class Module extends ListActivity {
                     SoapFault es = (SoapFault) e;
                     Log.e(es.getClass().getSimpleName(), es.getMessage());
                     error(es.getMessage());
+                } else if (e instanceof XmlPullParserException) {
+                	errorMsg = getString(R.string.errorServerResponseMsg);
+                    Log.e(e.getClass().getSimpleName(), errorMsg);
+                    error(errorMsg);
+                } else if (e instanceof IOException) {
+                	errorMsg = getString(R.string.errorConnectionMsg);
+                    Log.e(e.getClass().getSimpleName(), errorMsg);
+                    error(errorMsg);
+                } else if (e instanceof TimeoutException) {
+                	errorMsg = getString(R.string.errorTimeoutMsg);
+                    Log.e(e.getClass().getSimpleName(), errorMsg);
+                    error(errorMsg);
                 } else {
                     Log.e(e.getClass().getSimpleName(), e.getMessage());
                     error(e.getMessage());