Fixed Android 1.6 compatibility issues
This commit is contained in:
parent
0534b1ac62
commit
e359b3448e
|
@ -2,10 +2,10 @@
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="es.ugr.swad.swadroid"
|
package="es.ugr.swad.swadroid"
|
||||||
android:versionCode="4" android:versionName="0.2.1">
|
android:versionCode="4" android:versionName="0.2.1">
|
||||||
<application>
|
<application android:debuggable="true">
|
||||||
<activity android:name=".SWADMain"
|
<activity android:name=".SWADMain"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:icon="@drawable/swadroid" android:configChanges="orientation">
|
android:icon="@drawable/swadroid" android:configChanges="keyboard|keyboardHidden|orientation">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN"/>
|
<action android:name="android.intent.action.MAIN"/>
|
||||||
<category android:name="android.intent.category.LAUNCHER"/>
|
<category android:name="android.intent.category.LAUNCHER"/>
|
||||||
|
@ -13,15 +13,14 @@
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".Preferences"
|
android:name=".Preferences"
|
||||||
android:label="@string/set_preferences" android:configChanges="orientation">
|
android:label="@string/set_preferences" android:configChanges="keyboard|keyboardHidden|orientation">
|
||||||
</activity>
|
</activity>
|
||||||
<activity
|
<activity
|
||||||
android:name=".modules.Login"
|
android:name=".modules.Login"
|
||||||
android:label="@string/loginModuleLabel" android:configChanges="orientation">
|
android:label="@string/loginModuleLabel" android:configChanges="keyboard|keyboardHidden|orientation">
|
||||||
</activity>
|
</activity>
|
||||||
</application>
|
</application>
|
||||||
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
|
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
|
||||||
<uses-sdk android:targetSdkVersion="9" android:minSdkVersion="4"></uses-sdk>
|
<uses-sdk android:targetSdkVersion="4" android:minSdkVersion="4"></uses-sdk>
|
||||||
<supports-screens android:resizeable="true" android:xlargeScreens="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"></supports-screens>
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
|
@ -21,6 +21,7 @@ package es.ugr.swad.swadroid;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.content.res.Configuration;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.preference.Preference;
|
import android.preference.Preference;
|
||||||
import android.preference.Preference.OnPreferenceClickListener;
|
import android.preference.Preference.OnPreferenceClickListener;
|
||||||
|
@ -94,9 +95,8 @@ public class Preferences extends PreferenceActivity {
|
||||||
userPassword = prefs.getString("userPasswordPref", "");
|
userPassword = prefs.getString("userPasswordPref", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* (non-Javadoc)
|
||||||
* Called when activity is first created.
|
* @see android.app.Activity#onCreate()
|
||||||
* @param savedInstanceState State of activity.
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
|
|
@ -24,6 +24,7 @@ import com.android.dataframework.DataFramework;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
|
import android.content.res.Configuration;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
|
@ -32,7 +33,6 @@ import android.view.MenuItem;
|
||||||
import android.view.Window;
|
import android.view.Window;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
import es.ugr.swad.swadroid.model.DataBaseHelper;
|
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.modules.Login;
|
||||||
import es.ugr.swad.swadroid.ssl.SecureConnection;
|
import es.ugr.swad.swadroid.ssl.SecureConnection;
|
||||||
|
|
||||||
|
@ -73,11 +73,8 @@ public class SWADMain extends Activity {
|
||||||
})*/
|
})*/
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* (non-Javadoc)
|
||||||
* Creates application menu.
|
* @see android.app.Activity#onCreateOptionsMenu()
|
||||||
* @param menu Object to store created menu.
|
|
||||||
* @return true if menu was created.
|
|
||||||
* false if menu was not created.
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
@ -86,11 +83,8 @@ public class SWADMain extends Activity {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* (non-Javadoc)
|
||||||
* Called when an item of menu is selected.
|
* @see android.app.Activity#onOptionsItemSelected()
|
||||||
* @param item Item selected.
|
|
||||||
* @return true if action was performed.
|
|
||||||
* false if action was not performed.
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
@ -110,11 +104,8 @@ public class SWADMain extends Activity {
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* (non-Javadoc)
|
||||||
* Handles the result of launch an activity and performs an action.
|
* @see android.app.Activity#onActivityResult()
|
||||||
* @param requestCode Identifier of action requested.
|
|
||||||
* @param resultCode Status of activity's result (correct or not).
|
|
||||||
* @param data Data returned by launched activity.
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
|
@ -141,8 +132,8 @@ public class SWADMain extends Activity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* (non-Javadoc)
|
||||||
* Called each time activity is started.
|
* @see android.app.Activity#onStart()
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected void onStart() {
|
protected void onStart() {
|
||||||
|
@ -150,9 +141,8 @@ public class SWADMain extends Activity {
|
||||||
prefs.getPreferences(getBaseContext());
|
prefs.getPreferences(getBaseContext());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* (non-Javadoc)
|
||||||
* Called when activity is first created.
|
* @see android.app.Activity#onCreate()
|
||||||
* @param icicle State of activity.
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void onCreate(Bundle icicle) {
|
public void onCreate(Bundle icicle) {
|
||||||
|
|
|
@ -22,7 +22,7 @@ package es.ugr.swad.swadroid.modules;
|
||||||
import android.app.ProgressDialog;
|
import android.app.ProgressDialog;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.util.Base64;
|
//import android.util.Base64;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import es.ugr.swad.swadroid.Global;
|
import es.ugr.swad.swadroid.Global;
|
||||||
import es.ugr.swad.swadroid.R;
|
import es.ugr.swad.swadroid.R;
|
||||||
|
@ -30,6 +30,7 @@ import es.ugr.swad.swadroid.model.User;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import org.kobjects.base64.Base64;
|
||||||
import org.ksoap2.SoapFault;
|
import org.ksoap2.SoapFault;
|
||||||
import org.xmlpull.v1.XmlPullParserException;
|
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
|
//Encrypts user password with SHA-512 and encodes it to Base64
|
||||||
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 = 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();
|
||||||
|
|
|
@ -190,9 +190,8 @@ public class Module extends Activity {
|
||||||
this.result = result;
|
this.result = result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* (non-Javadoc)
|
||||||
* Called when activity is first created.
|
* @see android.app.Activity#onCreate()
|
||||||
* @param savedInstanceState State of activity.
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
@ -207,11 +206,8 @@ public class Module extends Activity {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* (non-Javadoc)
|
||||||
* Handles the result of launch an activity and performs an action.
|
* @see android.app.Activity#onActivityResult()
|
||||||
* @param requestCode Identifier of action requested.
|
|
||||||
* @param resultCode Status of activity's result (correct or not).
|
|
||||||
* @param data Data returned by launched activity.
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
|
@ -290,8 +286,8 @@ public class Module extends Activity {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/* (non-Javadoc)
|
||||||
* Called when activity is paused.
|
* @see android.app.Activity#onPause()
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
protected void onPause() {
|
protected void onPause() {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
package="es.ugr.swad.swadroid.test"
|
package="es.ugr.swad.swadroid.test"
|
||||||
android:versionCode="1"
|
android:versionCode="1"
|
||||||
android:versionName="1.0">
|
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" />
|
<uses-library android:name="android.test.runner" />
|
||||||
</application>
|
</application>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user