From e359b3448e7e6947a181443932ea5027499482c2 Mon Sep 17 00:00:00 2001 From: Juan Miguel Boyero Corral Date: Wed, 5 Jan 2011 21:25:57 +0100 Subject: [PATCH] Fixed Android 1.6 compatibility issues --- SWADroid/AndroidManifest.xml | 11 +++-- .../src/es/ugr/swad/swadroid/Preferences.java | 8 ++-- .../src/es/ugr/swad/swadroid/SWADMain.java | 44 +++++++------------ .../es/ugr/swad/swadroid/modules/Login.java | 7 ++- .../es/ugr/swad/swadroid/modules/Module.java | 26 +++++------ SWADroidTest/AndroidManifest.xml | 2 +- 6 files changed, 43 insertions(+), 55 deletions(-) diff --git a/SWADroid/AndroidManifest.xml b/SWADroid/AndroidManifest.xml index 0a974fc9..e71da648 100644 --- a/SWADroid/AndroidManifest.xml +++ b/SWADroid/AndroidManifest.xml @@ -2,10 +2,10 @@ - + + android:icon="@drawable/swadroid" android:configChanges="keyboard|keyboardHidden|orientation"> @@ -13,15 +13,14 @@ + android:label="@string/set_preferences" android:configChanges="keyboard|keyboardHidden|orientation"> + android:label="@string/loginModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation"> - - + diff --git a/SWADroid/src/es/ugr/swad/swadroid/Preferences.java b/SWADroid/src/es/ugr/swad/swadroid/Preferences.java index d02e0778..bba48c24 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/Preferences.java +++ b/SWADroid/src/es/ugr/swad/swadroid/Preferences.java @@ -21,6 +21,7 @@ package es.ugr.swad.swadroid; import android.content.Context; import android.content.SharedPreferences; +import android.content.res.Configuration; import android.os.Bundle; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; @@ -94,10 +95,9 @@ public class Preferences extends PreferenceActivity { userPassword = prefs.getString("userPasswordPref", ""); } - /** - * Called when activity is first created. - * @param savedInstanceState State of activity. - */ + /* (non-Javadoc) + * @see android.app.Activity#onCreate() + */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java index c3d3f20f..13c52585 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java +++ b/SWADroid/src/es/ugr/swad/swadroid/SWADMain.java @@ -24,6 +24,7 @@ import com.android.dataframework.DataFramework; import android.app.Activity; import android.app.AlertDialog; import android.content.Intent; +import android.content.res.Configuration; import android.os.Bundle; import android.util.Log; import android.view.Menu; @@ -32,7 +33,6 @@ import android.view.MenuItem; import android.view.Window; import android.widget.Toast; import es.ugr.swad.swadroid.model.DataBaseHelper; -import es.ugr.swad.swadroid.model.User; import es.ugr.swad.swadroid.modules.Login; import es.ugr.swad.swadroid.ssl.SecureConnection; @@ -73,12 +73,9 @@ public class SWADMain extends Activity { })*/ } - /** - * Creates application menu. - * @param menu Object to store created menu. - * @return true if menu was created. - * false if menu was not created. - */ + /* (non-Javadoc) + * @see android.app.Activity#onCreateOptionsMenu() + */ @Override public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); @@ -86,12 +83,9 @@ public class SWADMain extends Activity { return true; } - /** - * Called when an item of menu is selected. - * @param item Item selected. - * @return true if action was performed. - * false if action was not performed. - */ + /* (non-Javadoc) + * @see android.app.Activity#onOptionsItemSelected() + */ @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { @@ -110,12 +104,9 @@ public class SWADMain extends Activity { return super.onOptionsItemSelected(item); } - /** - * Handles the result of launch an activity and performs an action. - * @param requestCode Identifier of action requested. - * @param resultCode Status of activity's result (correct or not). - * @param data Data returned by launched activity. - */ + /* (non-Javadoc) + * @see android.app.Activity#onActivityResult() + */ @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode == Activity.RESULT_OK) { @@ -141,19 +132,18 @@ public class SWADMain extends Activity { } } - /** - * Called each time activity is started. - */ + /* (non-Javadoc) + * @see android.app.Activity#onStart() + */ @Override protected void onStart() { super.onStart(); prefs.getPreferences(getBaseContext()); } - - /** - * Called when activity is first created. - * @param icicle State of activity. - */ + + /* (non-Javadoc) + * @see android.app.Activity#onCreate() + */ @Override public void onCreate(Bundle icicle) { try { diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java index 64b83035..a5878345 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Login.java @@ -22,7 +22,7 @@ package es.ugr.swad.swadroid.modules; import android.app.ProgressDialog; import android.os.AsyncTask; import android.os.Bundle; -import android.util.Base64; +//import android.util.Base64; import android.util.Log; import es.ugr.swad.swadroid.Global; import es.ugr.swad.swadroid.R; @@ -30,6 +30,7 @@ import es.ugr.swad.swadroid.model.User; import java.io.IOException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import org.kobjects.base64.Base64; import org.ksoap2.SoapFault; import org.xmlpull.v1.XmlPullParserException; @@ -79,7 +80,9 @@ public class Login extends Module { //Encrypts user password with SHA-512 and encodes it to Base64 md = MessageDigest.getInstance("SHA-512"); 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 = userPassword.replace('+','-').replace('/','_').replace('=', ' ').replaceAll("\\s+", "").trim(); //Creates webservice request, adds required params and sends request to webservice createRequest(); diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java index 7a59bb7d..81a6d343 100644 --- a/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java +++ b/SWADroid/src/es/ugr/swad/swadroid/modules/Module.java @@ -189,11 +189,10 @@ public class Module extends Activity { public void setResult(ArrayList result) { this.result = result; } - - /** - * Called when activity is first created. - * @param savedInstanceState State of activity. - */ + + /* (non-Javadoc) + * @see android.app.Activity#onCreate() + */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -206,13 +205,10 @@ public class Module extends Activity { startActivityForResult(loginActivity, Global.LOGIN_REQUEST_CODE); } } - - /** - * Handles the result of launch an activity and performs an action. - * @param requestCode Identifier of action requested. - * @param resultCode Status of activity's result (correct or not). - * @param data Data returned by launched activity. - */ + + /* (non-Javadoc) + * @see android.app.Activity#onActivityResult() + */ @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode == Activity.RESULT_OK) { @@ -290,9 +286,9 @@ public class Module extends Activity { } - /** - * Called when activity is paused. - */ + /* (non-Javadoc) + * @see android.app.Activity#onPause() + */ @Override protected void onPause() { super.onPause(); diff --git a/SWADroidTest/AndroidManifest.xml b/SWADroidTest/AndroidManifest.xml index 71068167..44a66e58 100644 --- a/SWADroidTest/AndroidManifest.xml +++ b/SWADroidTest/AndroidManifest.xml @@ -3,7 +3,7 @@ package="es.ugr.swad.swadroid.test" android:versionCode="1" android:versionName="1.0"> - +