summaryrefslogtreecommitdiff
path: root/app/src/main/java/de
diff options
context:
space:
mode:
authorTom Hennen <TomHennen@users.noreply.github.com>2016-05-20 17:25:32 -0400
committerTom Hennen <TomHennen@users.noreply.github.com>2016-05-20 17:25:32 -0400
commit6d67566891f56a78ae8867f8119e4ad6d0e82924 (patch)
treefb6574f0bf8265f21154626d7bdd07eefaae7bea /app/src/main/java/de
parent9b5f2db7d1fc3908a9035a108ed9c4ab4a138bf4 (diff)
parentcf942d1350d3925ab48858aa524e83c93b1e5c19 (diff)
downloadAntennaPod-6d67566891f56a78ae8867f8119e4ad6d0e82924.zip
Merge pull request #1944 from andrewgaul/xlint
Enable Xlint and correct warnings
Diffstat (limited to 'app/src/main/java/de')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java b/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
index 40cd5a903..538af8c79 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/CoverTarget.java
@@ -48,7 +48,7 @@ class CoverTarget extends GlideDrawableImageViewTarget {
}
@Override
- public void onResourceReady(GlideDrawable drawable, GlideAnimation anim) {
+ public void onResourceReady(GlideDrawable drawable, GlideAnimation<? super GlideDrawable> anim) {
super.onResourceReady(drawable, anim);
TextView txtvPlaceholder = placeholder.get();
if (txtvPlaceholder != null) {
diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
index 6c03dc7ae..183ef338a 100644
--- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
+++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
@@ -127,7 +127,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
*
* @return PreferenceActivity if the API level is greater than 10, PreferenceActivityGingerbread otherwise.
*/
- public static Class getPreferenceActivity() {
+ public static Class<? extends Activity> getPreferenceActivity() {
if (Build.VERSION.SDK_INT > 10) {
return PreferenceActivity.class;
} else {