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

Fixed Android 1.6 compatibility issues

Browse Source
This commit is contained in:
Juan Miguel Boyero Corral 2011-01-05 21:25:57 +01:00
parent 0534b1ac62
commit e359b3448e
6 changed files with 43 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SWADroid/AndroidManifest.xml
View File

@ -2,10 +2,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="es.ugr.swad.swadroid"
android:versionCode="4" android:versionName="0.2.1">
<application>
<application android:debuggable="true">
<activity android:name=".SWADMain"
android:label="@string/app_name"
android:icon="@drawable/swadroid" android:configChanges="orientation">
android:icon="@drawable/swadroid" android:configChanges="keyboard|keyboardHidden|orientation">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
@ -13,15 +13,14 @@
</activity>
<activity
android:name=".Preferences"
android:label="@string/set_preferences" android:configChanges="orientation">
android:label="@string/set_preferences" android:configChanges="keyboard|keyboardHidden|orientation">
</activity>
<activity
android:name=".modules.Login"
android:label="@string/loginModuleLabel" android:configChanges="orientation">
android:label="@string/loginModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation">
</activity>
</application>
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
<uses-sdk android:targetSdkVersion="9" android:minSdkVersion="4"></uses-sdk>
<supports-screens android:resizeable="true" android:xlargeScreens="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"></supports-screens>
<uses-sdk android:targetSdkVersion="4" android:minSdkVersion="4"></uses-sdk>
</manifest>

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

@ -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,9 +95,8 @@ 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) {

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

@ -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,11 +73,8 @@ 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) {
@ -86,11 +83,8 @@ 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) {
@ -110,11 +104,8 @@ 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) {
@ -141,8 +132,8 @@ public class SWADMain extends Activity {
}
}
/**
* Called each time activity is started.
/* (non-Javadoc)
* @see android.app.Activity#onStart()
*/
@Override
protected void onStart() {
@ -150,9 +141,8 @@ public class SWADMain extends Activity {
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) {

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

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

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

@ -190,9 +190,8 @@ public class Module extends Activity {
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) {
@ -207,11 +206,8 @@ public class Module extends Activity {
}
}
/**
* 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) {
@ -290,8 +286,8 @@ public class Module extends Activity {
}
/**
* Called when activity is paused.
/* (non-Javadoc)
* @see android.app.Activity#onPause()
*/
@Override
protected void onPause() {

2
SWADroidTest/AndroidManifest.xml
View File

@ -3,7 +3,7 @@
package="es.ugr.swad.swadroid.test"
android:versionCode="1"
android:versionName="1.0">
<application android:icon="@drawable/icon" android:label="@string/app_name">
<application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true">
<uses-library android:name="android.test.runner" />
</application>