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

Improved error management.

Browse Source
This commit is contained in:
Juan Miguel Boyero Corral 2013-06-29 13:11:13 +02:00
parent 8d8a895420
commit 78b5d1f18f
2 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java
View File

@ -74,6 +74,10 @@ public class Notifications extends Module {
* Notifications counter
*/
private int notifCount;
/**
* Error message returned by the synchronization service
*/
private String errorMessage;
/**
* Unique identifier for notification alerts
*/
@ -424,7 +428,10 @@ public class Notifications extends Module {
Log.i(TAG, "Stopped sync");
notifCount = intent.getIntExtra("notifCount", 0);
if (notifCount == 0) {
errorMessage = intent.getStringExtra("errorMessage");
if((errorMessage != null) && !errorMessage.equals("")) {
error(TAG, errorMessage, null, true);
} else if (notifCount == 0) {
Toast.makeText(context, R.string.NoNotificationsMsg, Toast.LENGTH_LONG).show();
}

57
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsSyncAdapterService.java
View File

@ -51,6 +51,7 @@ import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Vector;
import java.util.concurrent.TimeoutException;
/**
* Service for notifications sync adapter.
@ -70,6 +71,7 @@ public class NotificationsSyncAdapterService extends Service {
private static final String SOAP_ACTION = "";
private static SoapObject request;
private static Object result;
private static String errorMessage = "";
public static final String START_SYNC = "es.ugr.swad.swadroid.sync.start";
public static final String STOP_SYNC = "es.ugr.swad.swadroid.sync.stop";
@ -89,6 +91,7 @@ public class NotificationsSyncAdapterService extends Service {
dbHelper = new DataBaseHelper(mContext);
} catch (Exception e) {
e.printStackTrace();
errorMessage = e.getMessage();
//Send exception details to Bugsense
BugSenseHandler.sendException(e);
@ -101,16 +104,43 @@ public class NotificationsSyncAdapterService extends Service {
prefs.getPreferences(mContext);
SIZE_LIMIT = prefs.getNotifLimit();
NotificationsSyncAdapterService.performSync(mContext, account, extras, authority, provider, syncResult);
} catch (Exception e) {
} catch (Exception e) {
if (e instanceof SoapFault) {
SoapFault es = (SoapFault) e;
if (es.faultstring.equals("Bad log in")) {
errorMessage = mContext.getString(R.string.errorBadLoginMsg);
} else if (es.faultstring.equals("Unknown application key")) {
errorMessage = mContext.getString(R.string.errorBadAppKeyMsg);
} else {
errorMessage = "Server error: " + es.getMessage();
}
} else if (e instanceof XmlPullParserException) {
errorMessage = mContext.getString(R.string.errorServerResponseMsg);
e.printStackTrace();
//Send exception details to Bugsense
BugSenseHandler.sendException(e);
} else if (e instanceof TimeoutException) {
errorMessage = mContext.getString(R.string.errorTimeoutMsg);
//} else if (e instanceof IOException) {
// errorMsg = getString(R.string.errorConnectionMsg);
} else {
errorMessage = e.getMessage();
e.printStackTrace();
//Send exception details to Bugsense
BugSenseHandler.sendException(e);
}
//Notify synchronization stop
Intent stopIntent = new Intent();
stopIntent.setAction(STOP_SYNC);
stopIntent.putExtra("notifCount", notifCount);
stopIntent.putExtra("errorMessage", errorMessage);
mContext.sendBroadcast(stopIntent);
e.printStackTrace();
//Send exception details to Bugsense
BugSenseHandler.sendException(e);
}
}
}
@ -126,6 +156,18 @@ public class NotificationsSyncAdapterService extends Service {
super.onCreate();
}
/* (non-Javadoc)
* @see android.app.Service#onStartCommand(android.content.Intent, int, int)
*/
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
super.onStartCommand(intent, flags, startId);
// return START_NOT_STICKY - we want this Service to be left running
// unless explicitly stopped, and it's process is killed, we want it to
// be restarted
return START_STICKY;
}
/* (non-Javadoc)
* @see android.app.Service#onDestroy()
*/
@ -372,7 +414,8 @@ public class NotificationsSyncAdapterService extends Service {
//Notify synchronization stop
Intent stopIntent = new Intent();
stopIntent.setAction(STOP_SYNC);
stopIntent.putExtra("notifCount", notifCount);
stopIntent.putExtra("notifCount", notifCount);
stopIntent.putExtra("errorMessage", errorMessage);
context.sendBroadcast(stopIntent);
}
}