From b2de7512f4c871e882760bfe8bffa27d10c1c68a Mon Sep 17 00:00:00 2001 From: daniel oeh Date: Fri, 28 Mar 2014 21:16:27 +0100 Subject: Replaced AppConfig.DEBUG with BuildConfig.DEBUG --- .../antennapod/util/menuhandler/FeedItemMenuHandler.java | 4 ++-- .../danoeh/antennapod/util/menuhandler/FeedMenuHandler.java | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src/de/danoeh/antennapod/util/menuhandler') diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java index 615c1c93e..6733430da 100644 --- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java +++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java @@ -3,7 +3,7 @@ package de.danoeh.antennapod.util.menuhandler; import android.content.Context; import android.content.Intent; import android.net.Uri; -import de.danoeh.antennapod.AppConfig; +import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.service.playback.PlaybackService; @@ -95,7 +95,7 @@ public class FeedItemMenuHandler { mi.setItemVisibility(R.id.share_link_item, false); } - if (!AppConfig.DEBUG + if (!BuildConfig.DEBUG || !(state == FeedItem.State.IN_PROGRESS || state == FeedItem.State.READ)) { mi.setItemVisibility(R.id.mark_unread_item, false); } diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java index 537335618..ae8b3ac1e 100644 --- a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java +++ b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java @@ -4,18 +4,12 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.util.Log; - import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; - -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -import de.danoeh.antennapod.AppConfig; +import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.FeedInfoActivity; -import de.danoeh.antennapod.asynctask.FlattrClickWorker; import de.danoeh.antennapod.feed.Feed; import de.danoeh.antennapod.service.download.DownloadService; import de.danoeh.antennapod.storage.DBTasks; @@ -23,7 +17,6 @@ import de.danoeh.antennapod.storage.DBWriter; import de.danoeh.antennapod.storage.DownloadRequestException; import de.danoeh.antennapod.storage.DownloadRequester; import de.danoeh.antennapod.util.ShareUtils; -import de.danoeh.antennapod.util.flattr.FlattrStatus; /** Handles interactions with the FeedItemMenu. */ public class FeedMenuHandler { @@ -39,7 +32,7 @@ public class FeedMenuHandler { return true; } - if (AppConfig.DEBUG) + if (BuildConfig.DEBUG) Log.d(TAG, "Preparing options menu"); menu.findItem(R.id.mark_all_read_item).setVisible( selectedFeed.hasNewItems(true)); -- cgit v1.2.3