7.4.1: Fixed: "Sort by..." and "Update shows" were permanently disabled

after entering the Log mode (thx @casperklein); Fixed: "Use entire line to mark episode" did not work anymore (thx @casperklein).
ltguillaume · Feb 28, 2017 · f817fef · f817fef
1 parent cf6562e
commit f817fef
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="nl.asymmetrics.droidshows"
-	android:versionCode="740" android:versionName="7.4.0">
+	android:versionCode="741" android:versionName="7.4.1">
 	<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="11"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

diff --git a/src/nl/asymmetrics/droidshows/DroidShows.java b/src/nl/asymmetrics/droidshows/DroidShows.java
@@ -297,6 +297,16 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 			.setEnabled(!logMode && !searching());
 		menu.findItem(TOGGLE_EXCLUDE_SEEN_MENU_ITEM)
 			.setEnabled(!logMode && !searching());
+		menu.findItem(TOGGLE_EXCLUDE_SEEN_MENU_ITEM)
+			.setTitle((excludeSeen ? R.string.menu_include_seen : R.string.menu_exclude_seen));
+		menu.findItem(SORT_MENU_ITEM)
+			.setEnabled(!logMode);
+		menu.findItem(UNDO_MENU_ITEM)
+			.setVisible(undo.size() > 0);
+		menu.findItem(LOG_MODE_ITEM)
+			.setTitle((logMode ? R.string.menu_close_log: R.string.menu_log));
+		menu.findItem(UPDATEALL_MENU_ITEM)
+			.setEnabled(!logMode);
 
 		if (showArchive == 1) {
 			menu.findItem(TOGGLE_ARCHIVE_MENU_ITEM)
@@ -307,13 +317,6 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 				.setIcon(android.R.drawable.ic_menu_recent_history)
 				.setTitle(R.string.menu_show_archive);
 		}
-		if (excludeSeen) {
-			menu.findItem(TOGGLE_EXCLUDE_SEEN_MENU_ITEM)
-				.setTitle(R.string.menu_include_seen);
-		} else {
-			menu.findItem(TOGGLE_EXCLUDE_SEEN_MENU_ITEM)
-				.setTitle(R.string.menu_exclude_seen);
-		}
 		if (sortOption == SORT_BY_LAST_UNSEEN) {
 			menu.findItem(SORT_MENU_ITEM)
 				.setIcon(android.R.drawable.ic_menu_sort_alphabetically)
@@ -323,20 +326,6 @@ public boolean onPrepareOptionsMenu(Menu menu) {
 				.setIcon(android.R.drawable.ic_menu_sort_by_size)
 				.setTitle(R.string.menu_sort_last_unseen);
 		}
-		if (undo.size() > 0) {
-			menu.findItem(UNDO_MENU_ITEM).setVisible(true);
-		} else {
-			menu.findItem(UNDO_MENU_ITEM).setVisible(false);
-		}
-		if (logMode) {
-			menu.findItem(SORT_MENU_ITEM).setEnabled(false);
-			menu.findItem(UPDATEALL_MENU_ITEM).setEnabled(false);
-			menu.findItem(LOG_MODE_ITEM)
-				.setTitle(R.string.menu_close_log);
-		} else {
-			menu.findItem(LOG_MODE_ITEM)
-			.setTitle(R.string.menu_log);
-		}
 		return super.onPrepareOptionsMenu(menu);
 	}
 

diff --git a/src/nl/asymmetrics/droidshows/ui/SerieEpisodes.java b/src/nl/asymmetrics/droidshows/ui/SerieEpisodes.java
@@ -122,7 +122,9 @@ protected void onListItemClick(ListView l, View v, int position, long id) {
 		if (swipeDetect.value != 0) return;
 		if (DroidShows.fullLineCheckOption) {
 			try {
-				check(v);
+				CheckBox c = (CheckBox) v.findViewById(R.id.seen);
+				c.setChecked(!c.isChecked());
+				check(position, v, -1);
 			} catch (Exception e) {
 				Log.e(SQLiteStore.TAG, "Could not set episode seen state: "+ e.getMessage());
 			}