Bugfixing...

Author: amuttsch

res/layout-sw600dp-land/player_fragment.xml

@@ -160,7 +160,7 @@
 
 		</LinearLayout>
 
-		<fragment android:name="de.qspool.clementineremote.ui.fragments.PlaylistFragment"
+		<FrameLayout
               android:id="@+id/playlist_fragment"
               android:layout_weight="1"
               android:layout_width="match_parent"

src/de/qspool/clementineremote/backend/player/MyLibrary.java

@@ -63,6 +63,15 @@ public class MyLibrary extends
 
 	public MyLibrary(Context context) {
 		mContext = context;
+		
+		if (databaseExists()) {
+			openDatabase();
+			boolean dbOk = db.isDatabaseIntegrityOk();
+			closeDatabase();
+			
+			if (!dbOk)
+				getLibraryDb().delete();
+		}
 	}
 
 	public void addOnLibrarySelectFinishedListener(

src/de/qspool/clementineremote/ui/MainActivity.java

@@ -340,7 +340,8 @@ void disconnect() {
 	void MessageFromClementine(ClementineMessage clementineMessage) {
 		// Update the Player Fragment
 		if (mFragments.get(mCurrentFragment) != null && 
-			mFragments.get(mCurrentFragment).isVisible()) {
+			mFragments.get(mCurrentFragment).isVisible() &&
+			mFragments.get(mCurrentFragment).isAdded() ) {
 			mFragments.get(mCurrentFragment).MessageFromClementine(clementineMessage);
 		}
 	}

src/de/qspool/clementineremote/ui/fragments/PlayerFragment.java

@@ -104,7 +104,7 @@ public void onCreate(Bundle savedInstanceState) {
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
-		      Bundle savedInstanceState) {
+		      Bundle savedInstanceState) {		
 		View view = inflater.inflate(R.layout.player_fragment,
 				container, false);
 
@@ -150,7 +150,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 	    mPdDownloadLyrics.setMessage(getString(R.string.player_download_lyrics));
 	    mPdDownloadLyrics.setCancelable(true);
 
-	    mPlaylistSongs = (PlaylistFragment) getFragmentManager().findFragmentById(R.id.playlist_fragment);
+	    if (view.findViewById(R.id.playlist_fragment) != null) {
+		    mPlaylistSongs = new PlaylistFragment(); 
+		    getFragmentManager().beginTransaction().replace(R.id.playlist_fragment, mPlaylistSongs).commit();
+	    }
 
 		// Initialize interface
 	    updateTrackMetadata();
@@ -181,14 +184,6 @@ public void onResume() {
 		updateTrackMetadata();
 	}
 
-	@Override
-	public void onDestroyView() {
-		super.onDestroyView();
-		
-		if (mPlaylistSongs != null)
-			getFragmentManager().beginTransaction().remove(mPlaylistSongs).commit();
-	}
-	
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId())

src/de/qspool/clementineremote/ui/fragments/PlaylistFragment.java

@@ -145,7 +145,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             @Override
             public void onItemSelected(AdapterView<?> parent, View view,
                     int position, long id) {
-            	setId(App.mClementine.getPlaylists().valueAt(position).getId());
+            	mId = App.mClementine.getPlaylists().valueAt(position).getId();
             	updateSongList();
             }
 
@@ -244,15 +244,6 @@ public boolean onContextItemSelected(android.view.MenuItem item) {
 	    }
 	}
 
-	/**
-	 * Set the playlist id
-	 * @param id The playlist id, from which the songs are displayed
-	 */
-	public void setId(int id) {
-		mId = id;
-		mData = new LinkedList<MySong>(App.mClementine.getPlaylists().get(mId).getPlaylistSongs());
-	}
-	
 	public int getPlaylistId() {
 		return mId;
 	}

src/de/qspool/clementineremote/ui/fragments/SongInfoFragment.java

@@ -259,7 +259,7 @@ private void zoomImageFromThumb(final View thumbView) {
 	    }
 
 	    // If we don't have an image, do not zoom!
-	    if (mCurrentSong.getArt() == null) 
+	    if (mCurrentSong == null || mCurrentSong.getArt() == null) 
 	    	return;
 
 	    // Load the high-resolution "zoomed-in" image.