diff --git a/app/build.gradle b/app/build.gradle
index 0f261e1..915c6ad 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
applicationId "acr.browser.lightning"
minSdkVersion 14
targetSdkVersion 22
- versionCode 77
- versionName "4.0.9a"
+ versionCode 78
+ versionName "4.0.10a"
}
buildTypes {
@@ -33,8 +33,8 @@ android {
dependencies {
compile(project(':libnetcipher')) {
// Exclude any support-v4 modules because appcompat-v7 will import the latest
- exclude module:'support-v4'
- exclude module:'android-support-v4'
+ exclude module: 'support-v4'
+ exclude module: 'android-support-v4'
}
compile 'com.android.support:palette-v7:22.1.1'
compile 'com.android.support:appcompat-v7:22.1.1'
diff --git a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java
index a37ecb4..952b253 100644
--- a/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java
+++ b/app/src/main/java/acr/browser/lightning/reading/ArticleTextExtractor.java
@@ -127,7 +127,7 @@ public class ArticleTextExtractor {
}
public JResult extractContent(JResult res, Document doc, OutputFormatter formatter)
- throws Exception {
+ throws NullPointerException {
if (doc == null)
throw new NullPointerException("missing document");
diff --git a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
index 1d049fa..81a62cc 100644
--- a/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
+++ b/app/src/main/java/acr/browser/lightning/reading/HtmlFetcher.java
@@ -298,13 +298,13 @@ public class HtmlFetcher {
return SHelper.useDomainOfFirstArg4Second(url, urlOrPath);
}
- public String fetchAsString(String urlAsString, int timeout) throws MalformedURLException,
+ public String fetchAsString(String urlAsString, int timeout) throws
IOException {
return fetchAsString(urlAsString, timeout, true);
}
public String fetchAsString(String urlAsString, int timeout, boolean includeSomeGooseOptions)
- throws MalformedURLException, IOException {
+ throws IOException {
HttpURLConnection hConn = createUrlConnection(urlAsString, timeout, includeSomeGooseOptions);
hConn.setInstanceFollowRedirects(true);
String encoding = hConn.getContentEncoding();
@@ -401,7 +401,7 @@ public class HtmlFetcher {
}
protected HttpURLConnection createUrlConnection(String urlAsStr, int timeout,
- boolean includeSomeGooseOptions) throws MalformedURLException, IOException {
+ boolean includeSomeGooseOptions) throws IOException {
URL url = new URL(urlAsStr);
// using proxy may increase latency
HttpURLConnection hConn = (HttpURLConnection) url.openConnection(Proxy.NO_PROXY);
diff --git a/app/src/main/res/drawable-hdpi/ic_action_menu.png b/app/src/main/res/drawable-hdpi/ic_action_menu.png
deleted file mode 100644
index 36ff448..0000000
Binary files a/app/src/main/res/drawable-hdpi/ic_action_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_menu.png b/app/src/main/res/drawable-xhdpi/ic_action_menu.png
deleted file mode 100644
index c3c626f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_action_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/progress_bar.9.png b/app/src/main/res/drawable-xhdpi/progress_bar.9.png
deleted file mode 100644
index 3ee17a7..0000000
Binary files a/app/src/main/res/drawable-xhdpi/progress_bar.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png b/app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png
deleted file mode 100644
index daca8b7..0000000
Binary files a/app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_menu.png b/app/src/main/res/drawable-xxhdpi/ic_action_menu.png
deleted file mode 100644
index 18843e6..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_menu.png and /dev/null differ
diff --git a/app/src/main/res/drawable/progress.xml b/app/src/main/res/drawable/progress.xml
deleted file mode 100644
index a59c866..0000000
--- a/app/src/main/res/drawable/progress.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
- -
-
-
-
- -
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 9fa38ac..0e5a0b3 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -5,7 +5,7 @@
- @color/primary_color
- - @drawable/list_bg
+ - ?attr/listChoiceBackgroundIndicator
- @color/primary_color
- @color/secondary_color_settings
- @color/accent_color
@@ -21,7 +21,7 @@
- @color/primary_color_dark
- - @drawable/list_bg
+ - ?attr/listChoiceBackgroundIndicator
- @color/primary_color_dark
- @color/secondary_color_settings_dark
- @color/accent_color