From 7e0dc71265e814b2ec712f615ae0d142614a74bb Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Wed, 29 Jul 2020 00:31:23 +0200 Subject: Revert "Added new icon poll" This reverts commit cc04e08e7432920da712742804bde5f67b3391f7. --- .../java/de/test/antennapod/EspressoTestUtils.java | 7 ----- .../danoeh/antennapod/activity/MainActivity.java | 2 -- .../danoeh/antennapod/dialog/IconPollDialog.java | 35 ---------------------- 3 files changed, 44 deletions(-) delete mode 100644 app/src/main/java/de/danoeh/antennapod/dialog/IconPollDialog.java (limited to 'app') diff --git a/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java b/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java index 7b11e5b55..41c8365fb 100644 --- a/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java +++ b/app/src/androidTest/java/de/test/antennapod/EspressoTestUtils.java @@ -21,7 +21,6 @@ import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.download.DownloadService; import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.storage.PodDBAdapter; -import de.danoeh.antennapod.dialog.IconPollDialog; import de.danoeh.antennapod.dialog.RatingDialog; import de.danoeh.antennapod.fragment.NavDrawerFragment; import org.awaitility.Awaitility; @@ -135,12 +134,6 @@ public class EspressoTestUtils { .putString(UserPreferences.PREF_UPDATE_INTERVAL, "0") .commit(); - InstrumentationRegistry.getInstrumentation().getTargetContext() - .getSharedPreferences(IconPollDialog.PREFS_NAME, Context.MODE_PRIVATE) - .edit() - .putBoolean(IconPollDialog.KEY_DIALOG_ALLOWED, false) - .commit(); - RatingDialog.init(InstrumentationRegistry.getTargetContext()); RatingDialog.saveRated(); } diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index 8c8ce9522..eaa423708 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -32,7 +32,6 @@ import de.danoeh.antennapod.core.event.MessageEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.StorageUtils; import de.danoeh.antennapod.core.util.download.AutoUpdateManager; -import de.danoeh.antennapod.dialog.IconPollDialog; import de.danoeh.antennapod.dialog.RatingDialog; import de.danoeh.antennapod.fragment.AddFeedFragment; import de.danoeh.antennapod.fragment.AudioPlayerFragment; @@ -316,7 +315,6 @@ public class MainActivity extends CastEnabledActivity { super.onStart(); EventBus.getDefault().register(this); RatingDialog.init(this); - IconPollDialog.showIfNeeded(this); if (lastTheme != UserPreferences.getNoTitleTheme()) { finish(); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/IconPollDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/IconPollDialog.java deleted file mode 100644 index 70cf6dc78..000000000 --- a/app/src/main/java/de/danoeh/antennapod/dialog/IconPollDialog.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.danoeh.antennapod.dialog; - -import android.content.Context; -import android.content.SharedPreferences; -import androidx.appcompat.app.AlertDialog; -import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.util.IntentUtils; - -public class IconPollDialog { - - private IconPollDialog() { - - } - - public static final String PREFS_NAME = "IconPollDialog"; - public static final String KEY_DIALOG_ALLOWED = "dialog_allowed"; - - public static void showIfNeeded(Context context) { - SharedPreferences preferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE); - - if (!preferences.getBoolean(KEY_DIALOG_ALLOWED, true)) { - return; - } - - new AlertDialog.Builder(context) - .setTitle(R.string.icon_poll_title) - .setMessage(R.string.icon_poll_message) - .setCancelable(false) - .setPositiveButton(R.string.icon_poll_vote, (dialog, which) -> - IntentUtils.openInBrowser(context, "https://www.surveymonkey.com/r/96WSBLC")) - .setNegativeButton(R.string.icon_poll_dont_vote, null) - .setOnDismissListener(dialog -> preferences.edit().putBoolean(KEY_DIALOG_ALLOWED, false).apply()) - .show(); - } -} -- cgit v1.2.3