arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-16 17:42:03 +00:00
Code Issues Releases Wiki Activity

Don't show notifications on soft (I/O) errors

Browse Source 
* don't show notifications on soft (I/O) errors (closes #425)
* version bump to 0.6.10.2
This commit is contained in:
R Hirner 2015-01-18 17:35:44 +01:00
parent 9e082d930b
commit 1a796ade60
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="at.bitfire.davdroid" package="at.bitfire.davdroid"
android:versionCode="52" android:versionName="0.6.10.1" android:versionCode="53" android:versionName="0.6.10.2"
android:installLocation="internalOnly"> android:installLocation="internalOnly">
<uses-sdk <uses-sdk

2
app/src/main/java/at/bitfire/davdroid/Constants.java
View File

@ -9,7 +9,7 @@ package at.bitfire.davdroid;
public class Constants { public class Constants {
public static final String public static final String
APP_VERSION = "0.6.10.1", APP_VERSION = "0.6.10.2",
ACCOUNT_TYPE = "bitfire.at.davdroid", ACCOUNT_TYPE = "bitfire.at.davdroid",
WEB_URL_HELP = "https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app", WEB_URL_HELP = "https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app",
WEB_URL_VIEW_LOGS = "https://github.com/bitfireAT/davdroid/wiki/How-to-view-the-logs"; WEB_URL_VIEW_LOGS = "https://github.com/bitfireAT/davdroid/wiki/How-to-view-the-logs";

32
app/src/main/java/at/bitfire/davdroid/syncadapter/DavSyncAdapter.java
View File

@ -39,6 +39,8 @@ import java.net.URISyntaxException;
import java.util.Map; import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.net.ssl.SSLException;
import at.bitfire.davdroid.Constants; import at.bitfire.davdroid.Constants;
import at.bitfire.davdroid.R; import at.bitfire.davdroid.R;
import at.bitfire.davdroid.resource.LocalCollection; import at.bitfire.davdroid.resource.LocalCollection;
@ -130,7 +132,7 @@ public abstract class DavSyncAdapter extends AbstractThreadedSyncAdapter impleme
AccountSettings accountSettings = new AccountSettings(getContext(), account); AccountSettings accountSettings = new AccountSettings(getContext(), account);
Log.d(TAG, "Server supports VCard version " + accountSettings.getAddressBookVCardVersion()); Log.d(TAG, "Server supports VCard version " + accountSettings.getAddressBookVCardVersion());
Exception syncException = null; Exception exceptionToShow = null; // exception to show notification for
try { try {
// get local <-> remote collection pairs // get local <-> remote collection pairs
Map<LocalCollection<?>, RemoteCollection<?>> syncCollections = getSyncPairs(account, provider); Map<LocalCollection<?>, RemoteCollection<?>> syncCollections = getSyncPairs(account, provider);
@ -141,32 +143,32 @@ public abstract class DavSyncAdapter extends AbstractThreadedSyncAdapter impleme
for (Map.Entry<LocalCollection<?>, RemoteCollection<?>> entry : syncCollections.entrySet()) for (Map.Entry<LocalCollection<?>, RemoteCollection<?>> entry : syncCollections.entrySet())
new SyncManager(entry.getKey(), entry.getValue()).synchronize(extras.containsKey(ContentResolver.SYNC_EXTRAS_MANUAL), syncResult); new SyncManager(entry.getKey(), entry.getValue()).synchronize(extras.containsKey(ContentResolver.SYNC_EXTRAS_MANUAL), syncResult);
} catch (DavException ex) { } catch (DavException ex) {
syncException = ex; exceptionToShow = ex;
syncResult.stats.numParseExceptions++; syncResult.stats.numParseExceptions++;
Log.e(TAG, "Invalid DAV response", ex); Log.e(TAG, "Invalid DAV response", ex);
} catch (HttpException ex) { } catch (HttpException ex) {
if (ex.getCode() == HttpStatus.SC_UNAUTHORIZED) { if (ex.getCode() == HttpStatus.SC_UNAUTHORIZED) {
syncException = ex; exceptionToShow = ex;
Log.e(TAG, "HTTP Unauthorized " + ex.getCode(), ex); Log.e(TAG, "HTTP Unauthorized " + ex.getCode(), ex);
syncResult.stats.numAuthExceptions++; syncResult.stats.numAuthExceptions++; // hard error
} else if (ex.isClientError()) { } else if (ex.isClientError()) {
syncException = ex; exceptionToShow = ex;
Log.e(TAG, "Hard HTTP error " + ex.getCode(), ex); Log.e(TAG, "Hard HTTP error " + ex.getCode(), ex);
syncResult.stats.numParseExceptions++; syncResult.stats.numParseExceptions++; // hard error
} else { } else {
Log.w(TAG, "Soft HTTP error " + ex.getCode() + " (Android will try again later)", ex); Log.w(TAG, "Soft HTTP error " + ex.getCode() + " (Android will try again later)", ex);
syncResult.stats.numIoExceptions++; syncResult.stats.numIoExceptions++; // soft error
} }
} catch (LocalStorageException ex) { } catch (LocalStorageException ex) {
syncException = ex; exceptionToShow = ex;
syncResult.databaseError = true; syncResult.databaseError = true; // hard error
Log.e(TAG, "Local storage (content provider) exception", ex); Log.e(TAG, "Local storage (content provider) exception", ex);
} catch (IOException ex) { } catch (IOException ex) {
syncException = ex; syncResult.stats.numIoExceptions++; // soft error
syncResult.stats.numIoExceptions++;
Log.e(TAG, "I/O error (Android will try again later)", ex); Log.e(TAG, "I/O error (Android will try again later)", ex);
} catch (URISyntaxException ex) { } catch (URISyntaxException ex) {
syncException = ex; exceptionToShow = ex;
syncResult.stats.numParseExceptions++; // hard error
Log.e(TAG, "Invalid URI (file name) syntax", ex); Log.e(TAG, "Invalid URI (file name) syntax", ex);
} }
} finally { } finally {
@ -175,7 +177,7 @@ public abstract class DavSyncAdapter extends AbstractThreadedSyncAdapter impleme
} }
// show sync errors as notification // show sync errors as notification
if (syncException != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { if (exceptionToShow != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
Intent intentHelp = new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.WEB_URL_VIEW_LOGS)); Intent intentHelp = new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.WEB_URL_VIEW_LOGS));
PendingIntent contentIntent = PendingIntent.getActivity(context, 0, intentHelp, 0); PendingIntent contentIntent = PendingIntent.getActivity(context, 0, intentHelp, 0);
Notification.Builder builder = new Notification.Builder(context) Notification.Builder builder = new Notification.Builder(context)
@ -184,9 +186,9 @@ public abstract class DavSyncAdapter extends AbstractThreadedSyncAdapter impleme
.setOnlyAlertOnce(true) .setOnlyAlertOnce(true)
.setWhen(System.currentTimeMillis()) .setWhen(System.currentTimeMillis())
.setContentTitle(context.getString(R.string.sync_error_title)) .setContentTitle(context.getString(R.string.sync_error_title))
.setContentText(syncException.getLocalizedMessage()) .setContentText(exceptionToShow.getLocalizedMessage())
.setContentInfo(account.name) .setContentInfo(account.name)
.setStyle(new Notification.BigTextStyle().bigText(account.name + ":\n" + ExceptionUtils.getFullStackTrace(syncException))) .setStyle(new Notification.BigTextStyle().bigText(account.name + ":\n" + ExceptionUtils.getFullStackTrace(exceptionToShow)))
.setContentIntent(contentIntent); .setContentIntent(contentIntent);
NotificationManager notificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE); NotificationManager notificationManager = (NotificationManager)context.getSystemService(Context.NOTIFICATION_SERVICE);