catch two rare exceptions to fix crash

Daniel Gultsch created 3 years ago

Change summary

src/main/java/eu/siacs/conversations/persistance/FileBackend.java        | 2 
src/main/java/eu/siacs/conversations/services/MessageArchiveService.java | 6 
2 files changed, 6 insertions(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/persistance/FileBackend.java

@@ -722,7 +722,7 @@ public class FileBackend {
             if (cursor != null && cursor.moveToFirst()) {
                 filename = cursor.getString(0);
             }
-        } catch (final SecurityException | IllegalArgumentException e) {
+        } catch (final Exception e) {
             filename = null;
         }
         if (filename == null) {

src/main/java/eu/siacs/conversations/services/MessageArchiveService.java

@@ -256,7 +256,11 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
                     //do nothing
                 } else {
                     Log.d(Config.LOGTAG, a.getJid().asBareJid().toString() + ": error executing mam: " + p.toString());
-                    finalizeQuery(query, true);
+                    try {
+                        finalizeQuery(query, true);
+                    } catch (final IllegalStateException e) {
+                        //ignored
+                    }
                 }
             });
         } else {