diff --git a/.gitignore b/.gitignore
index f9d0d322..8807a7c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ build/
local.properties
import-summary.txt
Thumbs.db
+*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/datasources.xml
diff --git a/build.gradle b/build.gradle
old mode 100644
new mode 100755
index 017f6b25..f0411ebb
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
+ classpath 'com.android.tools.build:gradle:1.3.0'
}
}
diff --git a/org.fox.ttrss/org.fox.ttrss.iml b/org.fox.ttrss/org.fox.ttrss.iml
deleted file mode 100755
index be2e9277..00000000
--- a/org.fox.ttrss/org.fox.ttrss.iml
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugSources
- generateDebugTestSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 0838d385..8f8b98d9 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
+ android:versionCode="374"
+ android:versionName="1.147" >
0) {
- Pattern pattern = Pattern.compile("/embed/([\\w-]+)");
- Matcher matcher = pattern.matcher(srcEmbed);
+ String srcEmbed = flavorImage.attr("src");
- if (matcher.find()) {
- youtubeVid = matcher.group(1);
+ if (srcEmbed.length() > 0) {
+ Pattern pattern = Pattern.compile("/embed/([\\w-]+)");
+ Matcher matcher = pattern.matcher(srcEmbed);
- flavorImageUri = "https://img.youtube.com/vi/" + youtubeVid + "/mqdefault.jpg";
- flavorStreamUri = "https://youtu.be/" + youtubeVid;
+ if (matcher.find()) {
+ youtubeVid = matcher.group(1);
+
+ flavorImageUri = "https://img.youtube.com/vi/" + youtubeVid + "/mqdefault.jpg";
+ flavorStreamUri = "https://youtu.be/" + youtubeVid;
+ }
}
+ } else {
+ flavorImageUri = flavorImage.attr("src");
+ flavorStreamUri = null;
}
- } else {
- flavorImageUri = flavorImage.attr("src");
+ } catch (Exception e) {
+ e.printStackTrace();
+
+ flavorImage = null;
+ flavorImageUri = null;
flavorStreamUri = null;
}
}
diff --git a/taskerlocaleapi/taskerlocaleapi.iml b/taskerlocaleapi/taskerlocaleapi.iml
deleted file mode 100755
index 5dad5404..00000000
--- a/taskerlocaleapi/taskerlocaleapi.iml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugSources
- generateDebugTestSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file