Merge branch 'release/0.1' into develop
This commit is contained in:
commit
30acd24828
|
@ -1,3 +1,3 @@
|
|||
## 0.1 (2010-11-01)
|
||||
## 0.1 (2010-11-03)
|
||||
|
||||
* First release
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
package es.ugr.swad.swadroid;
|
||||
|
||||
/**
|
||||
* Global data of the application.
|
||||
* Global data of application.
|
||||
* @author Juan Miguel Boyero Corral <juanmi1982@gmail.com>
|
||||
*/
|
||||
public class Global {
|
||||
|
|
|
@ -30,7 +30,7 @@ import android.preference.PreferenceManager;
|
|||
import android.widget.Toast;
|
||||
|
||||
/**
|
||||
* Preferences window of the application.
|
||||
* Preferences window of application.
|
||||
* @author Juan Miguel Boyero Corral <juanmi1982@gmail.com>
|
||||
*/
|
||||
public class Preferences extends PreferenceActivity {
|
||||
|
@ -60,8 +60,8 @@ public class Preferences extends PreferenceActivity {
|
|||
}
|
||||
|
||||
/**
|
||||
* Initializes the preferences of the activity.
|
||||
* @param ctx Context of the activity.
|
||||
* Initializes preferences of activity.
|
||||
* @param ctx Context of activity.
|
||||
*/
|
||||
public void getPreferences(Context ctx) {
|
||||
// Get the xml/preferences.xml preferences
|
||||
|
@ -71,8 +71,8 @@ public class Preferences extends PreferenceActivity {
|
|||
}
|
||||
|
||||
/**
|
||||
* Called when the activity is first created.
|
||||
* @param savedInstanceState State of the activity.
|
||||
* Called when activity is first created.
|
||||
* @param savedInstanceState State of activity.
|
||||
*/
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
|
|
@ -65,8 +65,8 @@ public class SWADMain extends Activity {
|
|||
/**
|
||||
* Creates application menu.
|
||||
* @param menu Object to store created menu.
|
||||
* @return true if the menu was created.
|
||||
* false if the menu was not created.
|
||||
* @return true if menu was created.
|
||||
* false if menu was not created.
|
||||
*/
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(Menu menu) {
|
||||
|
@ -76,10 +76,10 @@ public class SWADMain extends Activity {
|
|||
}
|
||||
|
||||
/**
|
||||
* Called when an item of the menu is selected.
|
||||
* Called when an item of menu is selected.
|
||||
* @param item Item selected.
|
||||
* @return true if the action was performed.
|
||||
* false if the action was not performed.
|
||||
* @return true if action was performed.
|
||||
* false if action was not performed.
|
||||
*/
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
|
@ -103,9 +103,9 @@ public class SWADMain extends Activity {
|
|||
|
||||
/**
|
||||
* Handles the result of launch an activity and performs an action.
|
||||
* @param requestCode Identifier of the action requested.
|
||||
* @param resultCode Status of the activity's result (correct or not).
|
||||
* @param data Data returned by the launched activity.
|
||||
* @param requestCode Identifier of action requested.
|
||||
* @param resultCode Status of activity's result (correct or not).
|
||||
* @param data Data returned by launched activity.
|
||||
*/
|
||||
@Override
|
||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
|
@ -121,7 +121,7 @@ public class SWADMain extends Activity {
|
|||
}
|
||||
|
||||
/**
|
||||
* Called each time the activity is started.
|
||||
* Called each time activity is started.
|
||||
*/
|
||||
@Override
|
||||
protected void onStart() {
|
||||
|
@ -130,8 +130,8 @@ public class SWADMain extends Activity {
|
|||
}
|
||||
|
||||
/**
|
||||
* Called when the activity is first created.
|
||||
* @param icicle State of the activity.
|
||||
* Called when activity is first created.
|
||||
* @param icicle State of activity.
|
||||
*/
|
||||
@Override
|
||||
public void onCreate(Bundle icicle) {
|
||||
|
|
|
@ -29,7 +29,7 @@ public class User {
|
|||
*/
|
||||
private static String userCode;
|
||||
/**
|
||||
* Code of the user type.
|
||||
* Code of user type.
|
||||
*/
|
||||
private static String userTypeCode;
|
||||
/**
|
||||
|
@ -66,13 +66,13 @@ public class User {
|
|||
/**
|
||||
* Constructor.
|
||||
* @param userCode User code.
|
||||
* @param userTypeCode Code of the user type.
|
||||
* @param userTypeCode Code of user type.
|
||||
* @param wsKey Webservices session key.
|
||||
* @param userID User identifier.
|
||||
* @param userSurname1 User first surname.
|
||||
* @param userSurname2 User last surname.
|
||||
* @param userFirstName User name.
|
||||
* @param userTypeName Name of the user type.
|
||||
* @param userTypeName Name of user type.
|
||||
*/
|
||||
public User(String userCode, String userTypeCode, String wsKey, String userID, String userSurname1, String userSurname2, String userFirstName, String userTypeName) {
|
||||
User.userCode = userCode;
|
||||
|
|
|
@ -47,8 +47,8 @@ public class Login extends Module {
|
|||
String userPassword;
|
||||
|
||||
/**
|
||||
* Called when the activity is first created.
|
||||
* @param savedInstanceState State of the activity.
|
||||
* Called when activity is first created.
|
||||
* @param savedInstanceState State of activity.
|
||||
*/
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
@ -81,7 +81,7 @@ public class Login extends Module {
|
|||
md.update(prefs.getUserPassword().getBytes());
|
||||
userPassword = Base64.encode(md.digest());
|
||||
|
||||
//Creates webservice request, add required params and send request to webservice
|
||||
//Creates webservice request, adds required params and sends request to webservice
|
||||
createRequest();
|
||||
addParam("userID", prefs.getUserID());
|
||||
addParam("userPassword", userPassword);
|
||||
|
@ -148,7 +148,7 @@ public class Login extends Module {
|
|||
|
||||
/**
|
||||
* Called after calling background thread.
|
||||
* @param unused Does Nothing.
|
||||
* @param unused Does nothing.
|
||||
*/
|
||||
@Override
|
||||
protected void onPostExecute(Void unused) {
|
||||
|
|
|
@ -135,16 +135,16 @@ public class Module extends Activity {
|
|||
}
|
||||
|
||||
/**
|
||||
* Gets preferences of the activity.
|
||||
* @return Preferences of the activity.
|
||||
* Gets preferences of activity.
|
||||
* @return Preferences of activity.
|
||||
*/
|
||||
public Preferences getPrefs() {
|
||||
return prefs;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets preferences of the activity.
|
||||
* @param prefs Preferences of the activity.
|
||||
* Sets preferences of activity.
|
||||
* @param prefs Preferences of activity.
|
||||
*/
|
||||
public void setPrefs(Preferences prefs) {
|
||||
this.prefs = prefs;
|
||||
|
|
Loading…
Reference in New Issue
Block a user