From 79ead07d2126e7f94b16fb4409853934bb523db9 Mon Sep 17 00:00:00 2001
From: Roberta <rdeviti@wks-40-88.mpi-sws.org>
Date: Thu, 12 Jul 2018 16:32:08 +0200
Subject: [PATCH] catch

---
 .../org/mpisws/encounters/EncounterBasedCommunication.java | 4 ++--
 .../encounterhistory/bridges/EncounterEntriesBridge.java   | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ebclibrary/src/main/java/org/mpisws/encounters/EncounterBasedCommunication.java b/ebclibrary/src/main/java/org/mpisws/encounters/EncounterBasedCommunication.java
index e4f33580..b8bda451 100644
--- a/ebclibrary/src/main/java/org/mpisws/encounters/EncounterBasedCommunication.java
+++ b/ebclibrary/src/main/java/org/mpisws/encounters/EncounterBasedCommunication.java
@@ -43,8 +43,8 @@ import java.util.List;
  *
  **/
 public class EncounterBasedCommunication {
-    public static final long CHANGE_EPOCH_TIME = 2*60000;
-    public static final long SCAN_BATCH_INTERVAL = (long) (2 * 60000);
+    public static final long CHANGE_EPOCH_TIME = 1*60000;
+    public static final long SCAN_BATCH_INTERVAL = (long) (1 * 60000);
     public static final int REQUEST_ENABLE_BT = 1;
     public static final int REQUEST_ACCESS_FINE_LOCATION = 2;
     private static final String TAG = EncounterBasedCommunication.class.getSimpleName();
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 b9657ce3..aa70dd25 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
@@ -4,6 +4,7 @@ import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteConstraintException;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
@@ -96,7 +97,11 @@ public class EncounterEntriesBridge extends AbstractEncountersBridge<MEncounterE
         values.put(PEncounterEntries.Columns.otherTopicHandle, "");
         values.put(PEncounterEntries.Columns.shouldPostNonceToLink, shouldPostNonceToLink);
         values.put(PEncounterEntries.Columns.userHandle, userHandle);
-        context.getContentResolver().insert(EncounterHistoryAPM.getContentURI(EncounterHistoryAPM.encounterEntries), values);
+        try {
+            context.getContentResolver().insert(EncounterHistoryAPM.getContentURI(EncounterHistoryAPM.encounterEntries), values);
+        } catch (SQLiteConstraintException e) {
+            Log.d(TAG, "Duplicate insert attempted");
+        }
     }
 
     public void updateEndTime(long pkid, long endTime) {
-- 
GitLab