From d2ff4ab53a16988689153d0368ab253f05126fc9 Mon Sep 17 00:00:00 2001
From: Roberta <rdeviti@wks-40-88.mpi-sws.org>
Date: Thu, 12 Jul 2018 16:39:31 +0200
Subject: [PATCH] needs cleanup

---
 .../dbplatform/ContentProviderBase.java        | 18 +++++++++++-------
 .../bridges/EncounterEntriesBridge.java        |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ebclibrary/src/main/java/org/mpisws/encounters/dbplatform/ContentProviderBase.java b/ebclibrary/src/main/java/org/mpisws/encounters/dbplatform/ContentProviderBase.java
index ea1e43f1..51e2b356 100644
--- a/ebclibrary/src/main/java/org/mpisws/encounters/dbplatform/ContentProviderBase.java
+++ b/ebclibrary/src/main/java/org/mpisws/encounters/dbplatform/ContentProviderBase.java
@@ -87,14 +87,18 @@ public abstract class ContentProviderBase extends ContentProvider {
         final SQLiteDatabase db = dbHelper.getWritableDatabase(GlobalObjectRegistry.getObject(ESCredentials.class).getUserHandle());
         final MatchType matchType = codeToModel(matcher.match(uri));
         final DBModel dmb = matchType.getModel();
-        final long rowID = db.insertOrThrow(dmb.getTableName(), null, values);
-        if (rowID == -1) {
-            throw new SQLException("Insert failed");
+        try {
+            final long rowID = db.insertOrThrow(dmb.getTableName(), null, values);
+            if (rowID == -1) {
+                throw new SQLException("Insert failed");
+            }
+            final Uri insertedRowURI = ContentUris.withAppendedId(EncounterHistoryAPM.getContentURI(dmb), rowID);
+            getContext().getContentResolver().notifyChange(insertedRowURI, null);
+            return insertedRowURI;
+        } catch (Exception e) {
+            Log.e(TAG, e.getMessage());
         }
-        final Uri insertedRowURI = ContentUris.withAppendedId(EncounterHistoryAPM.getContentURI(dmb), rowID);
-        getContext().getContentResolver().notifyChange(insertedRowURI, null);
-        //Log.d(TAG, "Insert done");
-        return insertedRowURI;
+        return null;
     }
 
     public String addPKIDConditionToWhereClause(final String where, final String pkidString) { // TODO add to whereArgs instead
diff --git a/ebclibrary/src/main/java/org/mpisws/encounters/encounterhistory/bridges/EncounterEntriesBridge.java b/ebclibrary/src/main/java/org/mpisws/encounters/encounterhistory/bridges/EncounterEntriesBridge.java
index aa70dd25..a14bce49 100644
--- a/ebclibrary/src/main/java/org/mpisws/encounters/encounterhistory/bridges/EncounterEntriesBridge.java
+++ b/ebclibrary/src/main/java/org/mpisws/encounters/encounterhistory/bridges/EncounterEntriesBridge.java
@@ -99,7 +99,7 @@ public class EncounterEntriesBridge extends AbstractEncountersBridge<MEncounterE
         values.put(PEncounterEntries.Columns.userHandle, userHandle);
         try {
             context.getContentResolver().insert(EncounterHistoryAPM.getContentURI(EncounterHistoryAPM.encounterEntries), values);
-        } catch (SQLiteConstraintException e) {
+        } catch (Exception e) {
             Log.d(TAG, "Duplicate insert attempted");
         }
     }
-- 
GitLab