From 214971aec889f1aa10b7ddf7f4210ed4e9046947 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 10 Dec 2014 13:40:56 +0100 Subject: [PATCH] Broadcast intent if the database could not be read Fixes #2081 --- CHANGELOG.md | 2 +- src/biz/bokhorst/xprivacy/PrivacyService.java | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8aea5076..129d7fdca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ See for more information about XPrivacy 3 [this FAQ](https://github.com/M66B/XPr **Next release** -* ... +* Broadcast *biz.bokhorst.xprivacy.action.EXCEPTION* if the database could not be read ([issue](/../../issues/2081)) [Open issues](https://github.com/M66B/XPrivacy/issues?state=open) diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java index ed96b3c4d..f4333ed07 100644 --- a/src/biz/bokhorst/xprivacy/PrivacyService.java +++ b/src/biz/bokhorst/xprivacy/PrivacyService.java @@ -20,8 +20,11 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import android.annotation.SuppressLint; +import android.app.Notification; +import android.app.NotificationManager; import android.content.ContentValues; import android.content.Context; +import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -44,6 +47,7 @@ import android.os.StrictMode; import android.os.SystemClock; import android.os.StrictMode.ThreadPolicy; +import android.support.v4.app.NotificationCompat; import android.text.TextUtils; import android.util.Log; import android.util.Patterns; @@ -82,6 +86,7 @@ public class PrivacyService extends IPrivacyService.Stub { private static final String cServiceName = "xprivacy453"; private boolean mCorrupt = false; + private boolean mNotified = false; private SQLiteDatabase mDb = null; private SQLiteDatabase mDbUsage = null; private SQLiteStatement stmtGetRestriction = null; @@ -628,6 +633,8 @@ else if (slash > 0) // Domain name if (usage && hook != null) storeUsageData(restriction, secret, mresult); + } catch (SQLiteException ex) { + notifyException(ex); } catch (Throwable ex) { Util.bug(null, ex); } finally { @@ -1208,6 +1215,9 @@ public PSetting getSetting(PSetting setting) throws RemoteException { // Default value if (result.value == null) result.value = setting.value; + + } catch (SQLiteException ex) { + notifyException(ex); } catch (Throwable ex) { Util.bug(null, ex); } finally { @@ -2176,6 +2186,42 @@ public void run() { }); } + private void notifyException(Throwable ex) { + Util.bug(null, ex); + + if (mNotified) + return; + + Context context = getContext(); + if (context == null) + return; + + try { + Intent intent = new Intent("biz.bokhorst.xprivacy.action.EXCEPTION"); + intent.putExtra("Message", ex.toString()); + context.sendBroadcast(intent); + + NotificationManager notificationManager = (NotificationManager) context + .getSystemService(Context.NOTIFICATION_SERVICE); + + // Build notification + NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context); + notificationBuilder.setSmallIcon(R.drawable.ic_launcher); + notificationBuilder.setContentTitle(context.getString(R.string.app_name)); + notificationBuilder.setContentText(ex.toString()); + notificationBuilder.setWhen(System.currentTimeMillis()); + notificationBuilder.setAutoCancel(true); + Notification notification = notificationBuilder.build(); + + // Display notification + notificationManager.notify(Util.NOTIFY_CORRUPT, notification); + + mNotified = true; + } catch (Throwable exex) { + Util.bug(null, exex); + } + } + private boolean getSettingBool(int uid, String name, boolean defaultValue) throws RemoteException { return getSettingBool(uid, "", name, defaultValue); }