Merge lp:~karni/ubuntuone-android-music/fix-mediastore-conflict into lp:ubuntuone-android-music

[Michał Karnicki]

This branch defaults song year to 1 if it's equal to zero and adds a little safer code around cursor handling.

[lp:~karni/ubuntuone-android-music/fix-mediastore-conflict]

564. By Michał Karnicki on 2012-04-17

Don't include YEAR rather than bogus value 1.

[Chad Miller (cmiller)]

Nice.

review: Approve

=== modified file 'src/net/sourceforge/subsonic/androidapp/service/MediaStoreService.java'
--- src/net/sourceforge/subsonic/androidapp/service/MediaStoreService.java	2010-11-30 13:36:58 +0000
+++ src/net/sourceforge/subsonic/androidapp/service/MediaStoreService.java	2012-04-17 14:46:18 +0000
@@ -20,6 +20,8 @@
 
 import java.io.File;
 
+import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
+import net.sourceforge.subsonic.androidapp.util.FileUtil;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -27,8 +29,6 @@
 import android.net.Uri;
 import android.provider.MediaStore;
 import android.util.Log;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.util.FileUtil;
 
 /**
  * @author Sindre Mehus
@@ -57,20 +57,32 @@
         values.put(MediaStore.Audio.AudioColumns.ARTIST, song.getArtist());
         values.put(MediaStore.Audio.AudioColumns.ALBUM, song.getAlbum());
         values.put(MediaStore.Audio.AudioColumns.TRACK, song.getTrack());
-        values.put(MediaStore.Audio.AudioColumns.YEAR, song.getYear());
+        // Protect from failed SQLite constraint.
+        if (song.getYear() != 0) {
+            values.put(MediaStore.Audio.AudioColumns.YEAR, song.getYear());
+        }
         values.put(MediaStore.MediaColumns.DATA, songFile.getAbsolutePath());
         values.put(MediaStore.MediaColumns.MIME_TYPE, song.getContentType());
         values.put(MediaStore.Audio.AudioColumns.IS_MUSIC, 1);
 
         Uri uri = contentResolver.insert(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, values);
 
+        if (uri == null) {
+        	Log.w(TAG, "Audio MediaStore insert failed.");
+        	return;
+        }
+        
         // Look up album, and add cover art if found.
         Cursor cursor = contentResolver.query(uri, new String[]{MediaStore.Audio.AudioColumns.ALBUM_ID}, null, null, null);
-        if (cursor.moveToFirst()) {
-            int albumId = cursor.getInt(0);
-            insertAlbumArt(albumId, downloadFile);
+        try {
+        	if (cursor != null && cursor.moveToFirst()) {
+        		int albumId = cursor.getInt(0);
+        		insertAlbumArt(albumId, downloadFile);
+        	}
+        } finally {
+        	if (cursor != null)
+        		cursor.close();
         }
-        cursor.close();
     }
 
     public void deleteFromMediaStore(DownloadFile downloadFile) {
@@ -79,9 +91,8 @@
         File file = downloadFile.getCompleteFile();
 
         int n = contentResolver.delete(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                MediaStore.Audio.AudioColumns.TITLE_KEY + "=? AND " +
                         MediaStore.MediaColumns.DATA + "=?",
-                new String[]{MediaStore.Audio.keyFor(song.getTitle()), file.getAbsolutePath()});
+                        new String[]{file.getAbsolutePath()});
         if (n > 0) {
             Log.i(TAG, "Deleting media store row for " + song);
         }
 
=== modified file 'src/net/sourceforge/subsonic/androidapp/util/Util.java'
--- src/net/sourceforge/subsonic/androidapp/util/Util.java	2011-11-04 00:07:03 +0000
+++ src/net/sourceforge/subsonic/androidapp/util/Util.java	2012-04-17 14:46:18 +0000
@@ -56,7 +56,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;