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

Minor fixes

Browse Source 
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@107 5bc14d19-1e4b-4ba2-aa50-860af135f48c
This commit is contained in:
Juan Miguel Boyero Corral 2011-11-22 22:08:55 +00:00
parent 874a9a0c77
commit 733b5fc1f2
4 changed files with 72 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SWADroid/AndroidManifest.xml
View File

@ -19,12 +19,12 @@
android:name=".modules.Login" android:name=".modules.Login"
android:label="@string/loginModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation" android:theme="@android:style/Theme.Translucent.NoTitleBar"> android:label="@string/loginModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation" android:theme="@android:style/Theme.Translucent.NoTitleBar">
</activity> </activity>
<activity android:name=".modules.Courses"><activity android:name=".modules.Courses" android:theme="@android:style/Theme.Dialog"></activity></activity> <activity android:name=".modules.Courses" android:theme="@android:style/Theme.Translucent.NoTitleBar"><activity android:name=".modules.Courses" android:theme="@android:style/Theme.Dialog"></activity></activity>
<activity android:name=".modules.Notifications" android:label="@string/notificationsModuleLabel" android:icon="@drawable/ic_launcher_swadroid"></activity> <activity android:name=".modules.Notifications" android:label="@string/notificationsModuleLabel"></activity>
</application> </application>
<uses-permission android:name="android.permission.INTERNET"></uses-permission> <uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="10"></uses-sdk> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="11"></uses-sdk>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
<supports-screens android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:anyDensity="true" android:largeScreens="true" android:xlargeScreens="true"></supports-screens> <supports-screens android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:anyDensity="true" android:largeScreens="true" android:xlargeScreens="true"></supports-screens>
</manifest> </manifest>

1
SWADroid/src/es/ugr/swad/swadroid/model/User.java
View File

@ -308,4 +308,5 @@ public class User implements KvmSerializable {
case 7 : userTypeName = (String)obj; break; case 7 : userTypeName = (String)obj; break;
} }
} }
} }

17
SWADroid/src/es/ugr/swad/swadroid/modules/Courses.java
View File

@ -34,6 +34,7 @@ import es.ugr.swad.swadroid.model.Course;
import es.ugr.swad.swadroid.model.User; import es.ugr.swad.swadroid.model.User;
/** /**
* Courses module for get user's courses
* @author Juan Miguel Boyero Corral <juanmi1982@gmail.com> * @author Juan Miguel Boyero Corral <juanmi1982@gmail.com>
* *
*/ */
@ -46,6 +47,15 @@ public class Courses extends Module {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setMETHOD_NAME("getCourses"); setMETHOD_NAME("getCourses");
} }
/* (non-Javadoc)
* @see android.app.Activity#onStart()
*/
@Override
protected void onStart() {
super.onStart();
connect();
}
/** /**
* Launches action in a separate thread while shows a progress dialog * Launches action in a separate thread while shows a progress dialog
@ -87,7 +97,7 @@ public class Courses extends Module {
String name = pii.getProperty(1).toString(); String name = pii.getProperty(1).toString();
Course c = new Course(id, name); Course c = new Course(id, name);
dbHelper.insertCourse(c); dbHelper.insertCourse(c);
//Log.d("Courses", c.toString()); Log.d("Courses", c.toString());
} }
//Request finalized without errors //Request finalized without errors
@ -96,4 +106,9 @@ public class Courses extends Module {
finish(); finish();
} }
@Override
protected void postConnect() {
}
} }

88
SWADroid/src/es/ugr/swad/swadroid/modules/Login.java
View File

@ -45,10 +45,6 @@ public class Login extends Module {
* User password. * User password.
*/ */
private String userPassword; private String userPassword;
/**
* Connection available flag
*/
private boolean isConnected;
/* (non-Javadoc) /* (non-Javadoc)
* @see android.app.Activity#onCreate() * @see android.app.Activity#onCreate()
@ -56,11 +52,19 @@ public class Login extends Module {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setMETHOD_NAME("loginByUserPasswordKey"); setMETHOD_NAME("loginByUserPasswordKey");
connect();
} }
/** /* (non-Javadoc)
* @see android.app.Activity#onStart()
*/
@Override
protected void onStart() {
super.onStart();
connect();
}
/**
* Launches action in a separate thread while shows a progress dialog * Launches action in a separate thread while shows a progress dialog
* in UI thread. * in UI thread.
*/ */
@ -84,37 +88,49 @@ public class Login extends Module {
protected void requestService() protected void requestService()
throws NoSuchAlgorithmException, IOException, XmlPullParserException, SoapFault, IllegalAccessException, InstantiationException { throws NoSuchAlgorithmException, IOException, XmlPullParserException, SoapFault, IllegalAccessException, InstantiationException {
//Encrypts user password with SHA-512 and encodes it to Base64UrlSafe if(!Global.isLogged())
md = MessageDigest.getInstance("SHA-512"); {
md.update(prefs.getUserPassword().getBytes()); //Encrypts user password with SHA-512 and encodes it to Base64UrlSafe
//userPassword = new String(Base64.encode(md.digest(), Base64.URL_SAFE + Base64.NO_PADDING + Base64.NO_WRAP)); md = MessageDigest.getInstance("SHA-512");
userPassword = new String(Base64.encode(md.digest())); md.update(prefs.getUserPassword().getBytes());
userPassword = userPassword.replace('+','-').replace('/','_').replace('=', ' ').replaceAll("\\s+", "").trim(); //userPassword = new String(Base64.encode(md.digest(), Base64.URL_SAFE + Base64.NO_PADDING + Base64.NO_WRAP));
userPassword = new String(Base64.encode(md.digest()));
//Creates webservice request, adds required params and sends request to webservice userPassword = userPassword.replace('+','-').replace('/','_').replace('=', ' ').replaceAll("\\s+", "").trim();
createRequest();
addParam("userID", prefs.getUserID()); //Creates webservice request, adds required params and sends request to webservice
addParam("userPassword", userPassword); createRequest();
addParam("appKey", Global.getAppKey()); addParam("userID", prefs.getUserID());
sendRequest(User.class, true); addParam("userPassword", userPassword);
addParam("appKey", Global.getAppKey());
if (result != null) { sendRequest(User.class, true);
KvmSerializable ks = (KvmSerializable) result;
if (result != null) {
//Stores user data returned by webservice response KvmSerializable ks = (KvmSerializable) result;
User.setUserCode(ks.getProperty(0).toString());
User.setUserTypeCode(ks.getProperty(1).toString()); //Stores user data returned by webservice response
User.setWsKey(ks.getProperty(2).toString()); User.setUserCode(ks.getProperty(0).toString());
User.setUserID(ks.getProperty(3).toString()); User.setUserTypeCode(ks.getProperty(1).toString());
User.setUserSurname1(ks.getProperty(4).toString()); User.setWsKey(ks.getProperty(2).toString());
User.setUserSurname2(ks.getProperty(5).toString()); User.setUserID(ks.getProperty(3).toString());
User.setUserFirstName(ks.getProperty(6).toString()); User.setUserSurname1(ks.getProperty(4).toString());
User.setUserTypeName(ks.getProperty(7).toString()); User.setUserSurname2(ks.getProperty(5).toString());
User.setUserFirstName(ks.getProperty(6).toString());
//Request finalized without errors User.setUserTypeName(ks.getProperty(7).toString());
//Request finalized without errors
setResult(RESULT_OK);
Global.setLogged(true);
}
} else {
//Request finalized without errors
setResult(RESULT_OK); setResult(RESULT_OK);
} }
finish(); finish();
} }
@Override
protected void postConnect() {
}
} }