Fix a cursor not being closed

Still won't be the cause for #655

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/UriHelper.java

@@ -79,6 +79,7 @@ public class UriHelper {
      * Opens a stream to read the contents of the uri.
      * Note: the caller has to close the stream after usage.
      * Every invocation of this method will open a new stream.
+     * FIXME: make sure that every caller actually closes the returned stream!
      * @throws FileNotFoundException
      */
     @NonNull
@@ -127,6 +128,7 @@ public class UriHelper {
             if (cursor == null) {
                 throw new IOException("Unable to query metadata for: " + uri);
             }
+            try {
                 if (cursor.moveToFirst()) {
                     int name_index = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
                     if (name_index == -1) {
@@ -149,6 +151,9 @@ public class UriHelper {
                         throw new IOException("Unable to retrieve metadata for: " + uri + ": " + ex.getMessage());
                     }
                 }
+            } finally {
+                cursor.close();
+            }
         } else if (ContentResolver.SCHEME_FILE.equals(uriScheme)) {
             file = new File(uri.getPath());
             if (!file.exists()) {

app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/Tryout.java

@@ -32,4 +32,6 @@ public class Tryout extends TestBase {
         LOG.info("Calender: " + DateTimeUtils.formatDateTime(calendar.getTime()));
         Logging.logBytes(LOG, bytes);
     }
+
+
 }