](https://play.google.com/store/apps/details?id=de.danoeh.antennapod)
-[
](https://f-droid.org/app/de.danoeh.antennapod)
diff --git a/app/build.gradle b/app/build.gradle
index 6c8abbdff..3299ab715 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,49 +1,27 @@
-import org.apache.tools.ant.filters.ReplaceTokens
+plugins {
+ id('com.github.triplet.play') version '2.0.0'
+}
apply plugin: "com.android.application"
-apply plugin: 'com.github.triplet.play'
apply plugin: 'com.getkeepsafe.dexcount'
-repositories {
- maven { url "https://jitpack.io" }
- mavenCentral()
-}
-
-buildscript {
- repositories {
- jcenter()
- }
- dependencies {
- classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
- }
-}
-
-def getMyVersionName() {
- def parsedManifestXml = (new XmlSlurper())
- .parse("${projectDir}/src/main/AndroidManifest.xml")
- .declareNamespace(android: "http://schemas.android.com/apk/res/android")
- return parsedManifestXml."@android:versionName"
-}
-
-def getMyVersionCode() {
- def parsedManifestXml = (new XmlSlurper())
- .parse("${projectDir}/src/main/AndroidManifest.xml")
- .declareNamespace(android: "http://schemas.android.com/apk/res/android")
- return parsedManifestXml."@android:versionCode".toInteger()
-}
+import org.apache.tools.ant.filters.ReplaceTokens
android {
compileSdkVersion rootProject.ext.compileSdkVersion
- buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled true
- versionCode getMyVersionCode()
- versionName "${getMyVersionName()}"
+ vectorDrawables.useSupportLibrary true
+ // Version code schema:
+ // "1.2.3-SNAPSHOT" -> 1020300
+ // "1.2.3-RC4" -> 1020304
+ versionCode 1070196
+ versionName "1.7.1"
testApplicationId "de.test.antennapod"
- testInstrumentationRunner "de.test.antennapod.AntennaPodTestRunner"
+ testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
generatedDensities = []
}
@@ -95,7 +73,7 @@ android {
release {
resValue "string", "provider_authority", "de.danoeh.antennapod.provider"
minifyEnabled true
- proguardFile "proguard.cfg"
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), "proguard.cfg"
signingConfig signingConfigs.releaseConfig
buildConfigField STRING, FLATTR_APP_KEY, mFlattrAppKey
buildConfigField STRING, FLATTR_APP_SECRET, mFlattrAppSecret
@@ -120,6 +98,10 @@ android {
additionalParameters "--no-version-vectors"
}
+ testOptions {
+ animationsDisabled = true
+ }
+
flavorDimensions "market"
productFlavors {
free {
@@ -150,6 +132,7 @@ dependencies {
implementation "com.android.support:gridlayout-v7:$supportVersion"
implementation "com.android.support:percent:$supportVersion"
implementation "com.android.support:recyclerview-v7:$supportVersion"
+ compileOnly 'com.google.android.wearable:wearable:2.2.0'
implementation "org.apache.commons:commons-lang3:$commonslangVersion"
implementation("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
exclude group: "org.json", module: "json"
@@ -157,14 +140,14 @@ dependencies {
implementation "commons-io:commons-io:$commonsioVersion"
implementation "org.jsoup:jsoup:$jsoupVersion"
implementation "com.github.bumptech.glide:glide:$glideVersion"
+ annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
implementation "com.squareup.okio:okio:$okioVersion"
implementation "de.greenrobot:eventbus:$eventbusVersion"
- implementation "io.reactivex:rxandroid:$rxAndroidVersion"
- implementation "io.reactivex:rxjava:$rxJavaVersion"
- // And ProGuard rules for RxJava!
- implementation "com.artemzin.rxjava:proguard-rules:$rxJavaRulesVersion"
+ implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion"
+ implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
+
implementation "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion"
implementation "com.joanzapata.iconify:android-iconify-material:$iconifyVersion"
implementation("com.afollestad.material-dialogs:commons:$materialDialogsVersion") {
@@ -176,18 +159,33 @@ dependencies {
}
implementation "com.github.shts:TriangleLabelView:$triangleLabelViewVersion"
+ implementation 'com.leinardi.android:speed-dial:1.0.2' // 1.0.2 uses support 27.1.1 ; newer versions use 28.0.0;
implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
- implementation 'com.github.mfietz:fyydlin:v0.3'
- implementation 'com.github.ByteHamster:SearchPreference:v1.0.8'
+ implementation 'com.github.mfietz:fyydlin:v0.4.2'
+ implementation 'com.github.ByteHamster:SearchPreference:v1.2.5'
+ implementation "org.awaitility:awaitility:$awaitilityVersion"
androidTestImplementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
+ androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
+ androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
+ androidTestImplementation 'com.android.support.test:runner:1.0.2'
+ androidTestImplementation 'com.android.support.test:rules:1.0.2'
}
play {
- serviceAccountEmail = '522080222319-compute@developer.gserviceaccount.com'
- pk12File = file('../serviceaccount-c3d7d0f61387.p12')
+ if (project.hasProperty("antennaPodServiceAccountEmail")) {
+ serviceAccountEmail = antennaPodServiceAccountEmail
+ } else {
+ serviceAccountEmail = '522080222319-compute@developer.gserviceaccount.com'
+ }
+ if (project.hasProperty("antennaPodPk12File")) {
+ serviceAccountCredentials = file(antennaPodPk12File)
+ } else {
+ serviceAccountCredentials = file('../serviceaccount-c3d7d0f61387.p12')
+ }
}
// about.html is templatized so that we can automatically insert
@@ -217,10 +215,3 @@ task copyTextFiles(type: Copy) {
preBuild.dependsOn filterAbout, copyTextFiles
-allprojects {
- gradle.projectsEvaluated {
- tasks.withType(JavaCompile) {
- options.compilerArgs << "-Xlint" << "-Xlint:-deprecation" << "-Xlint:-serial"
- }
- }
-}
diff --git a/app/proguard.cfg b/app/proguard.cfg
index 01b1708f7..6df2ae9bf 100644
--- a/app/proguard.cfg
+++ b/app/proguard.cfg
@@ -53,8 +53,12 @@
public *;
}
+# for okhttp
-dontwarn okhttp3.**
-dontwarn okio.**
+-dontwarn javax.annotation.**
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+-dontwarn org.codehaus.mojo.animal_sniffer.*
# for RxJava:
-dontwarn sun.misc.Unsafe
@@ -71,8 +75,6 @@
-dontwarn android.support.v7.**
-dontwarn com.google.android.wearable.**
--keepattributes *Annotation*
-
-keep class org.shredzone.flattr4j.** { *; }
-dontwarn org.shredzone.flattr4j.**
@@ -94,16 +96,19 @@
-keepclassmembers class ** {
public void onEvent*(**);
}
+-keep class de.danoeh.antennapod.core.event.*
# android-iconify
-keep class com.joanzapata.** { *; }
# Glide
-keep public class * implements com.bumptech.glide.module.GlideModule
--keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
- **[] $VALUES;
- public *;
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+ **[] $VALUES;
+ public *;
}
+-dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
# for ViewPageIndicator problems (https://github.com/JakeWharton/ViewPagerIndicator/issues/366):
-dontwarn com.viewpagerindicator.LinePageIndicator
@@ -125,3 +130,13 @@
-keep class com.squareup.moshi.** { *; }
-keep interface com.squareup.moshi.** { *; }
-keep public class retrofit2.adapter.rxjava.RxJavaCallAdapterFactory { *; }
+
+# awaitility
+-dontwarn java.beans.BeanInfo
+-dontwarn java.beans.Introspector
+-dontwarn java.beans.IntrospectionException
+-dontwarn java.beans.PropertyDescriptor
+-dontwarn java.lang.management.ManagementFactory
+-dontwarn java.lang.management.ThreadInfo
+-dontwarn java.lang.management.ThreadMXBean
+
diff --git a/app/sampledata/episodes.json b/app/sampledata/episodes.json
new file mode 100644
index 000000000..209cbf180
--- /dev/null
+++ b/app/sampledata/episodes.json
@@ -0,0 +1,34 @@
+{
+ "data": [
+ {
+ "title": "FLOSS Weekly 482: PyPI",
+ "status_label": "NEW",
+ "duration": "00:52:40",
+ "published_at": "2. May"
+ },
+ {
+ "title": "FLOSS Weekly 479: Pidgin",
+ "status_label": " ",
+ "duration": "01:08:08",
+ "published_at": "11. Apr"
+ },
+ {
+ "title": "Linux Outlaws 370 - Stay Free, Stay Open Source",
+ "status_label": "NEW",
+ "duration": "02:52:51",
+ "published_at": "29. Dec 2014"
+ },
+ {
+ "title": "Linux Outlaws 368 - The Dark Ages of Free Software",
+ "status_label": " ",
+ "duration": "02:26:54",
+ "published_at": "14. Dec 2014"
+ },
+ {
+ "title": "Linux Outlaws 365 - Last Stand",
+ "status_label": " ",
+ "duration": "00:39:59",
+ "published_at": "3. Nov 2014"
+ }
+ ]
+}
diff --git a/app/sampledata/inplaylist b/app/sampledata/inplaylist
new file mode 100644
index 000000000..e78406d75
--- /dev/null
+++ b/app/sampledata/inplaylist
@@ -0,0 +1,2 @@
+@null
+@drawable/ic_list_grey600_24dp
\ No newline at end of file
diff --git a/app/sampledata/secondaryaction b/app/sampledata/secondaryaction
new file mode 100644
index 000000000..26083bc9c
--- /dev/null
+++ b/app/sampledata/secondaryaction
@@ -0,0 +1,3 @@
+@drawable/ic_play_arrow_grey600_36dp
+@drawable/ic_file_download_grey600_24dp
+@drawable/ic_cancel_grey600_24dp
\ No newline at end of file
diff --git a/app/src/androidTest/java/de/test/antennapod/AntennaPodTestRunner.java b/app/src/androidTest/java/de/test/antennapod/AntennaPodTestRunner.java
deleted file mode 100644
index c321e6494..000000000
--- a/app/src/androidTest/java/de/test/antennapod/AntennaPodTestRunner.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.test.antennapod;
-
-import android.test.InstrumentationTestRunner;
-import android.test.suitebuilder.TestSuiteBuilder;
-
-import junit.framework.TestSuite;
-
-public class AntennaPodTestRunner extends InstrumentationTestRunner {
-
- @Override
- public TestSuite getAllTests() {
- return new TestSuiteBuilder(AntennaPodTestRunner.class)
- .includeAllPackagesUnderHere()
- .excludePackages("de.test.antennapod.gpodnet")
- .build();
- }
-
-}
diff --git a/app/src/androidTest/java/de/test/antennapod/NthMatcher.java b/app/src/androidTest/java/de/test/antennapod/NthMatcher.java
new file mode 100644
index 000000000..f9ecacda5
--- /dev/null
+++ b/app/src/androidTest/java/de/test/antennapod/NthMatcher.java
@@ -0,0 +1,38 @@
+package de.test.antennapod;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class NthMatcher {
+ public static Some test text with a timecode " + timeStr + " here.
"); + Playable p = newTestPlayable(null, "Some test text with a timecode " + timeStr + " here.
", Integer.MAX_VALUE); + Timeline t = new Timeline(context, p); + String res = t.processShownotes(true); + checkLinkCorrect(res, new long[]{time}, new String[]{timeStr}); + } + + public void testProcessShownotesAddTimecodeHHMMSSMoreThen24HoursNoChapters() throws Exception { + final String timeStr = "25:00:00"; + final long time = 25 * 60 * 60 * 1000; + + Playable p = newTestPlayable(null, "Some test text with a timecode " + timeStr + " here.
", Integer.MAX_VALUE); Timeline t = new Timeline(context, p); String res = t.processShownotes(true); checkLinkCorrect(res, new long[]{time}, new String[]{timeStr}); @@ -54,17 +64,67 @@ public class TimelineTest extends InstrumentationTestCase { final String timeStr = "10:11"; final long time = 3600 * 1000 * 10 + 60 * 1000 * 11; - Playable p = newTestPlayable(null, "Some test text with a timecode " + timeStr + " here.
"); + Playable p = newTestPlayable(null, "Some test text with a timecode " + timeStr + " here.
", Integer.MAX_VALUE); Timeline t = new Timeline(context, p); String res = t.processShownotes(true); checkLinkCorrect(res, new long[]{time}, new String[]{timeStr}); } + public void testProcessShownotesAddTimecodeMMSSNoChapters() throws Exception { + final String timeStr = "10:11"; + final long time = 10 * 60 * 1000 + 11 * 1000; + + Playable p = newTestPlayable(null, "Some test text with a timecode " + timeStr + " here.
", 11 * 60 * 1000); + Timeline t = new Timeline(context, p); + String res = t.processShownotes(true); + checkLinkCorrect(res, new long[]{time}, new String[]{timeStr}); + } + + public void testProcessShownotesAddTimecodeHMMSSNoChapters() throws Exception { + final String timeStr = "2:11:12"; + final long time = 2 * 60 * 60 * 1000 + 11 * 60 * 1000 + 12 * 1000; + + Playable p = newTestPlayable(null, "Some test text with a timecode " + timeStr + " here.
", Integer.MAX_VALUE); + Timeline t = new Timeline(context, p); + String res = t.processShownotes(true); + checkLinkCorrect(res, new long[]{time}, new String[]{timeStr}); + } + + public void testProcessShownotesAddTimecodeMSSNoChapters() throws Exception { + final String timeStr = "1:12"; + final long time = 60 * 1000 + 12 * 1000; + + Playable p = newTestPlayable(null, "Some test text with a timecode " + timeStr + " here.
", 2 * 60 * 1000); + Timeline t = new Timeline(context, p); + String res = t.processShownotes(true); + checkLinkCorrect(res, new long[]{time}, new String[]{timeStr}); + } + + public void testProcessShownotesAddTimecodeMultipleFormatsNoChapters() throws Exception { + final String[] timeStrings = new String[]{ "10:12", "1:10:12" }; + + Playable p = newTestPlayable(null, "Some test text with a timecode " + timeStrings[0] + " here. Hey look another one " + timeStrings[1] + " here!
", 2 * 60 * 60 * 1000); + Timeline t = new Timeline(context, p); + String res = t.processShownotes(true); + checkLinkCorrect(res, new long[]{ 10 * 60 * 1000 + 12 * 1000, 60 * 60 * 1000 + 10 * 60 * 1000 + 12 * 1000 }, timeStrings); + } + + public void testProcessShownotesAddTimecodeMultipleShortFormatNoChapters() throws Exception { + + // One of these timecodes fits as HH:MM and one does not so both should be parsed as MM:SS. + final String[] timeStrings = new String[]{ "10:12", "2:12" }; + + Playable p = newTestPlayable(null, "Some test text with a timecode " + timeStrings[0] + " here. Hey look another one " + timeStrings[1] + " here!
", 3 * 60 * 60 * 1000); + Timeline t = new Timeline(context, p); + String res = t.processShownotes(true); + checkLinkCorrect(res, new long[]{ 10 * 60 * 1000 + 12 * 1000, 2 * 60 * 1000 + 12 * 1000 }, timeStrings); + } + public void testProcessShownotesAddTimecodeParentheses() throws Exception { final String timeStr = "10:11"; final long time = 3600 * 1000 * 10 + 60 * 1000 * 11; - Playable p = newTestPlayable(null, "Some test text with a timecode (" + timeStr + ") here.
"); + Playable p = newTestPlayable(null, "Some test text with a timecode (" + timeStr + ") here.
", Integer.MAX_VALUE); Timeline t = new Timeline(context, p); String res = t.processShownotes(true); checkLinkCorrect(res, new long[]{time}, new String[]{timeStr}); @@ -74,7 +134,7 @@ public class TimelineTest extends InstrumentationTestCase { final String timeStr = "10:11"; final long time = 3600 * 1000 * 10 + 60 * 1000 * 11; - Playable p = newTestPlayable(null, "Some test text with a timecode [" + timeStr + "] here.
"); + Playable p = newTestPlayable(null, "Some test text with a timecode [" + timeStr + "] here.
", Integer.MAX_VALUE); Timeline t = new Timeline(context, p); String res = t.processShownotes(true); checkLinkCorrect(res, new long[]{time}, new String[]{timeStr}); @@ -84,12 +144,27 @@ public class TimelineTest extends InstrumentationTestCase { final String timeStr = "10:11"; final long time = 3600 * 1000 * 10 + 60 * 1000 * 11; - Playable p = newTestPlayable(null, "Some test text with a timecode <" + timeStr + "> here.
"); + Playable p = newTestPlayable(null, "Some test text with a timecode <" + timeStr + "> here.
", Integer.MAX_VALUE); Timeline t = new Timeline(context, p); String res = t.processShownotes(true); checkLinkCorrect(res, new long[]{time}, new String[]{timeStr}); } + public void testProcessShownotesAndInvalidTimecode() throws Exception { + final String[] timeStrs = new String[] {"2:1", "0:0", "000", "00", "00:000"}; + + StringBuilder shownotes = new StringBuilder("Some test text with timecodes "); + for (String timeStr : timeStrs) { + shownotes.append(timeStr).append(" "); + } + shownotes.append("here.
"); + + Playable p = newTestPlayable(null, shownotes.toString(), Integer.MAX_VALUE); + Timeline t = new Timeline(context, p); + String res = t.processShownotes(true); + checkLinkCorrect(res, new long[0], new String[0]); + } + private void checkLinkCorrect(String res, long[] timecodes, String[] timecodeStr) { assertNotNull(res); Document d = Jsoup.parse(res); diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java index afe15f1b2..8d2408b45 100644 --- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java +++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/AtomGenerator.java @@ -56,6 +56,11 @@ public class AtomGenerator implements FeedGenerator{ xml.text(feed.getDescription()); xml.endTag(null, "subtitle"); } + if (feed.getImageUrl() != null) { + xml.startTag(null, "logo"); + xml.text(feed.getImageUrl()); + xml.endTag(null, "logo"); + } if (feed.getPaymentLink() != null) { GeneratorUtil.addPaymentLink(xml, feed.getPaymentLink(), false); diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java index 7f6f0fb0f..89542d222 100644 --- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java +++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/GeneratorUtil.java @@ -8,6 +8,7 @@ import java.io.IOException; * Utility methods for FeedGenerator */ class GeneratorUtil { + private GeneratorUtil(){} public static void addPaymentLink(XmlSerializer xml, String paymentLink, boolean withNamespace) throws IOException { String ns = (withNamespace) ? "http://www.w3.org/2005/Atom" : null; diff --git a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java index f2d53799d..5f8b4d18c 100644 --- a/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java +++ b/app/src/androidTest/java/de/test/antennapod/util/syndication/feedgenerator/RSS2Generator.java @@ -54,6 +54,13 @@ public class RSS2Generator implements FeedGenerator{ xml.text(feed.getLanguage()); xml.endTag(null, "language"); } + if (feed.getImageUrl() != null) { + xml.startTag(null, "image"); + xml.startTag(null, "url"); + xml.text(feed.getImageUrl()); + xml.endTag(null, "url"); + xml.endTag(null, "image"); + } if (feed.getPaymentLink() != null) { GeneratorUtil.addPaymentLink(xml, feed.getPaymentLink(), true); diff --git a/app/src/free/play b/app/src/free/play new file mode 120000 index 000000000..e9d641154 --- /dev/null +++ b/app/src/free/play @@ -0,0 +1 @@ +../main/play \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c7541cb59..216afc6b7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,14 +1,8 @@" + webViewData + "