Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Adapted all Modules to work with a global actual course. It is

Browse Source 
functional, however, initial states should be revised and better
defined. The appearance should be also improved.
This commit is contained in:
Helena Rodriguez 2012-04-09 18:29:22 +02:00
parent cf85e9ec19
commit 0b791516c2
8 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SWADroid/res/layout/main.xml
View File

@ -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>
</LinearLayout>

2
SWADroid/src/es/ugr/swad/swadroid/Global.java
View File

@ -31,7 +31,7 @@ public class Global {
/**
* SWAD application key
*/
private static final String AppKey = "";
private static final String AppKey = "HTC-Desire";
/**
* Server URL
*/

6
SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
View File

@ -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;
}
}

1
SWADroid/src/es/ugr/swad/swadroid/modules/Module.java
View File

@ -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);

2
SWADroid/src/es/ugr/swad/swadroid/modules/Notices.java
View File

@ -199,4 +199,4 @@ public class Notices extends Module {
}
}

6
SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java
View File

@ -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());

3
SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java
View File

@ -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();
}
}
}

1
SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java
View File

@ -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);