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" /> - - - \ No newline at end of file + diff --git a/SWADroid/src/es/ugr/swad/swadroid/Global.java b/SWADroid/src/es/ugr/swad/swadroid/Global.java index 92d9f141..36c0d6f7 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/Global.java +++ b/SWADroid/src/es/ugr/swad/swadroid/Global.java @@ -31,7 +31,7 @@ public class Global { /** * SWAD application key */ - private static final String AppKey = ""; + private static final String AppKey = "HTC-Desire"; /** * Server URL */ diff --git a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java index 24758c97..e862aaee 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; @@ -48,6 +49,9 @@ import es.ugr.swad.swadroid.model.DataBaseHelper; import es.ugr.swad.swadroid.model.Model; import es.ugr.swad.swadroid.modules.Courses; import es.ugr.swad.swadroid.modules.Groups; +import es.ugr.swad.swadroid.model.Course; +import es.ugr.swad.swadroid.model.DataBaseHelper; +import es.ugr.swad.swadroid.model.Model; import es.ugr.swad.swadroid.modules.Messages; import es.ugr.swad.swadroid.modules.Module; import es.ugr.swad.swadroid.modules.Notices; @@ -383,7 +387,6 @@ public class SWADMain extends MenuExpandableListActivity { courseCode = courseSelected.getId(); Global.setSelectedCourseCode(courseCode); createMenu(); - } @Override @@ -567,5 +570,4 @@ public class SWADMain extends MenuExpandableListActivity { } currentRole = Global.TEACHER_TYPE_CODE; } - } 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 f906178d..e212d4e1 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..cd506a50 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(); } - } + } } @@ -114,7 +113,6 @@ public class TestsConfigDownload extends Module { if (result != null) { //Stores tests data returned by webservice response Vector res = (Vector) result; - Integer pluggable = new Integer(res.get(0).toString()); isPluggable = Global.parseIntBool(pluggable); numQuestions = new Integer(res.get(1).toString()); 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..599e9da3 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java @@ -651,7 +651,6 @@ public class TestsMake extends Module { test = (Test) dbHelper.getRow(Global.DB_TABLE_TEST_CONFIG, "id", Long.toString(Global.getSelectedCourseCode())); - if(test != null) { setNumQuestions(); } else { @@ -661,7 +660,7 @@ public class TestsMake extends Module { } else { Toast.makeText(getBaseContext(), R.string.testNoQuestionsMsg, Toast.LENGTH_LONG).show(); finish(); - } + } } diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java index 6cce9afe..2be0f3c1 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java @@ -91,7 +91,6 @@ public class TestsQuestionsDownload extends Module { sendRequest(Test.class, false); if (result != null) { - //Stores tests data returned by webservice response Vector res = (Vector) result; SoapObject tagsListObject = (SoapObject)res.get(0);