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

Added toast message

Browse Source 
git-svn-id: https://forja.rediris.es/svn/cusl6-swadroid/trunk@105 5bc14d19-1e4b-4ba2-aa50-860af135f48c
This commit is contained in:
Juan Miguel Boyero Corral 2011-11-22 22:08:41 +00:00
parent 784046b298
commit 612a69ddf9
1 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,12 +57,6 @@ public class Login extends Module {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setMETHOD_NAME("loginByUserPasswordKey"); setMETHOD_NAME("loginByUserPasswordKey");
isConnected = connectionAvailable(this);
if (!isConnected) {
Toast.makeText(this, R.string.errorMsgNoConnection, Toast.LENGTH_LONG).show();
}
connect(); connect();
} }
@ -73,6 +67,7 @@ public class Login extends Module {
protected void connect() { protected void connect() {
String progressDescription = getString(R.string.loginProgressDescription); String progressDescription = getString(R.string.loginProgressDescription);
int progressTitle = R.string.loginProgressTitle; int progressTitle = R.string.loginProgressTitle;
Toast.makeText(this, progressDescription, Toast.LENGTH_LONG).show();
new Connect(false, progressDescription, progressTitle).execute(); new Connect(false, progressDescription, progressTitle).execute();
} }
@ -89,39 +84,37 @@ 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 {
if (isConnected) { //Encrypts user password with SHA-512 and encodes it to Base64UrlSafe
//Encrypts user password with SHA-512 and encodes it to Base64UrlSafe md = MessageDigest.getInstance("SHA-512");
md = MessageDigest.getInstance("SHA-512"); md.update(prefs.getUserPassword().getBytes());
md.update(prefs.getUserPassword().getBytes()); //userPassword = new String(Base64.encode(md.digest(), Base64.URL_SAFE + Base64.NO_PADDING + Base64.NO_WRAP));
//userPassword = new String(Base64.encode(md.digest(), Base64.URL_SAFE + Base64.NO_PADDING + Base64.NO_WRAP)); userPassword = new String(Base64.encode(md.digest()));
userPassword = new String(Base64.encode(md.digest())); userPassword = userPassword.replace('+','-').replace('/','_').replace('=', ' ').replaceAll("\\s+", "").trim();
userPassword = userPassword.replace('+','-').replace('/','_').replace('=', ' ').replaceAll("\\s+", "").trim();
//Creates webservice request, adds required params and sends request to webservice //Creates webservice request, adds required params and sends request to webservice
createRequest(); createRequest();
addParam("userID", prefs.getUserID()); addParam("userID", prefs.getUserID());
addParam("userPassword", userPassword); addParam("userPassword", userPassword);
addParam("appKey", Global.getAppKey()); addParam("appKey", Global.getAppKey());
sendRequest(User.class, true); sendRequest(User.class, true);
if (result != null) { if (result != null) {
KvmSerializable ks = (KvmSerializable) result; KvmSerializable ks = (KvmSerializable) result;
//Stores user data returned by webservice response //Stores user data returned by webservice response
User.setUserCode(ks.getProperty(0).toString()); User.setUserCode(ks.getProperty(0).toString());
User.setUserTypeCode(ks.getProperty(1).toString()); User.setUserTypeCode(ks.getProperty(1).toString());
User.setWsKey(ks.getProperty(2).toString()); User.setWsKey(ks.getProperty(2).toString());
User.setUserID(ks.getProperty(3).toString()); User.setUserID(ks.getProperty(3).toString());
User.setUserSurname1(ks.getProperty(4).toString()); User.setUserSurname1(ks.getProperty(4).toString());
User.setUserSurname2(ks.getProperty(5).toString()); User.setUserSurname2(ks.getProperty(5).toString());
User.setUserFirstName(ks.getProperty(6).toString()); User.setUserFirstName(ks.getProperty(6).toString());
User.setUserTypeName(ks.getProperty(7).toString()); User.setUserTypeName(ks.getProperty(7).toString());
//Request finalized without errors //Request finalized without errors
setResult(RESULT_OK); setResult(RESULT_OK);
}
} }
finish(); finish();
} }
} }