From 93643269a874fdf7b56a779fff4002b8ead913de Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sat, 16 Jun 2018 12:02:50 +0200 Subject: [PATCH] Fix a cursor crash Signed-off-by: Mario Danic --- .../talk/controllers/RingtoneSelectionController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java index 228860fdd..5c54449d0 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/RingtoneSelectionController.java @@ -80,6 +80,8 @@ public class RingtoneSelectionController extends BaseController implements Flexi private MediaPlayer mediaPlayer; private Handler cancelMediaPlayerHandler; + private Cursor cursor; + public RingtoneSelectionController(Bundle args) { super(args); setHasOptionsMenu(true); @@ -180,7 +182,7 @@ public class RingtoneSelectionController extends BaseController implements Flexi manager.setType(RingtoneManager.TYPE_NOTIFICATION); } - Cursor cursor = manager.getCursor(); + cursor = manager.getCursor(); NotificationSoundItem notificationSoundItem; @@ -212,8 +214,6 @@ public class RingtoneSelectionController extends BaseController implements Flexi } } } - - cursor.close(); } adapter.updateDataSet(abstractFlexibleItemList, true); @@ -299,6 +299,9 @@ public class RingtoneSelectionController extends BaseController implements Flexi @Override public void onDestroy() { endMediaPlayer(); + if (cursor != null) { + cursor.close(); + } super.onDestroy(); }