From 347ef252356db671e77e3a52e55bf27ca02537e6 Mon Sep 17 00:00:00 2001
From: Helena Rodriguez <hrgijon@gmail.com>
Date: Mon, 9 Apr 2012 18:29:22 +0200
Subject: [PATCH] Adapted all Modules to work with a global actual course. It
 is functional, however, initial states should be revised and better defined.
 The appearance should be also improved.

---
 SWADroid/res/layout/main.xml                                 | 4 +---
 SWADroid/src/es/ugr/swad/swadroid/Global.java                | 5 ++++-
 SWADroid/src/es/ugr/swad/swadroid/SWADMain.java              | 2 ++
 SWADroid/src/es/ugr/swad/swadroid/modules/Module.java        | 1 +
 SWADroid/src/es/ugr/swad/swadroid/modules/Notices.java       | 2 +-
 .../ugr/swad/swadroid/modules/tests/TestsConfigDownload.java | 5 ++---
 .../src/es/ugr/swad/swadroid/modules/tests/TestsMake.java    | 3 +--
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/SWADroid/res/layout/main.xml b/SWADroid/res/layout/main.xml
index cc86e5d2..29d9cc96 100644
--- a/SWADroid/res/layout/main.xml
+++ b/SWADroid/res/layout/main.xml
@@ -12,12 +12,10 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:prompt="@string/selectCourseTitle" />
-
     <ExpandableListView
         android:id="@+id/android:list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:cacheColorHint="@color/background" >
     </ExpandableListView>
-
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/SWADroid/src/es/ugr/swad/swadroid/Global.java b/SWADroid/src/es/ugr/swad/swadroid/Global.java
index a58445c5..77d9aec6 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/Global.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/Global.java
@@ -30,7 +30,7 @@ public class Global {
 	/**
 	 * SWAD application key
 	 */
-	private static final String AppKey = "";
+	private static final String AppKey = "HTC-Desire";
 	/**
 	 * Server URL
 	 */
@@ -271,6 +271,7 @@ public class Global {
 	public static void setSelectedCourseCode(long actualCourseCode){
 		if(actualCourseCode >0) selectedCourseCode = actualCourseCode;
 	}
+<<<<<<< HEAD
 
 	public static boolean isPreferencesChanged(){
 		return preferencesChanged;
@@ -282,4 +283,6 @@ public class Global {
 	public static void setPreferencesChanged(boolean newState){
 		preferencesChanged = newState;
 	}
+=======
+>>>>>>> Adapted all Modules to work with a global actual course. It is
 }
diff --git a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
index 44f6a18e..06446102 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
@@ -19,6 +19,7 @@
 
 package es.ugr.swad.swadroid;
 
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -441,6 +442,7 @@ public class SWADMain extends MenuExpandableListActivity {
 			courseCode = courseSelected.getId();
 			Global.setSelectedCourseCode(courseCode);
 			int userRole = courseSelected.getUserRole();
+
 			if(userRole == 3 && actualRole != 3) createTeacherMenu();
 			if(userRole == 2 && actualRole != 2) createStudentMenu();
 		}
diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java
index 56b54604..39dd7fa5 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java
@@ -412,6 +412,7 @@ public abstract class Module extends MenuActivity {
     	 * Use of KeepAliveHttpsTransport deals with the problems with the Android ssl libraries having trouble
     	 * with certificates and certificate authorities somehow messing up connecting/needing reconnects.
     	 */
+    	String u =prefs.getServer();
     	URL = prefs.getServer();
         connection = new KeepAliveHttpsTransportSE(URL, 443, "", TIMEOUT);
         SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Notices.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Notices.java
index 54a25f0c..4304eaab 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/modules/Notices.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Notices.java
@@ -199,4 +199,4 @@ public class Notices extends Module {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java
index 84499cfb..84d87e34 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java
@@ -74,8 +74,7 @@ public class TestsConfigDownload extends Module {
 	protected void onStart() {
 		super.onStart();
 		prefs.getPreferences(getBaseContext());
-		try {					
-
+		try {
 			if(isDebuggable) {
 				Log.d(TAG, "selectedCourseCode = " + Long.toString(Global.getSelectedCourseCode()));
 			}
@@ -89,7 +88,7 @@ public class TestsConfigDownload extends Module {
 				Log.e(ex.getClass().getSimpleName(), errorMsg);        		
 				ex.printStackTrace();
 			}
-		}		
+		}
 	}
 
 
diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java
index 7f335313..1151e0e8 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java
@@ -661,8 +661,7 @@ public class TestsMake extends Module {
 		} else {
 			Toast.makeText(getBaseContext(), R.string.testNoQuestionsMsg, Toast.LENGTH_LONG).show();
 			finish();
-		}		
-
+		}
 	}
 
 	/* (non-Javadoc)