From e335a2b93681d6747eec814947e2e53b02112e20 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Tue, 5 May 2015 20:57:42 -0400 Subject: [PATCH] Remove unused resources, code cleanup --- app/build.gradle | 8 ++++---- .../reading/ArticleTextExtractor.java | 2 +- .../lightning/reading/HtmlFetcher.java | 6 +++--- .../main/res/drawable-hdpi/ic_action_menu.png | Bin 296 -> 0 bytes .../res/drawable-xhdpi/ic_action_menu.png | Bin 391 -> 0 bytes .../res/drawable-xhdpi/progress_bar.9.png | Bin 174 -> 0 bytes .../res/drawable-xhdpi/progress_bar_bg.9.png | Bin 179 -> 0 bytes .../res/drawable-xxhdpi/ic_action_menu.png | Bin 722 -> 0 bytes app/src/main/res/drawable/progress.xml | 18 ------------------ app/src/main/res/values-v21/styles.xml | 4 ++-- 10 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_menu.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_menu.png delete mode 100644 app/src/main/res/drawable-xhdpi/progress_bar.9.png delete mode 100644 app/src/main/res/drawable-xhdpi/progress_bar_bg.9.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_menu.png delete mode 100644 app/src/main/res/drawable/progress.xml 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 36ff44804735685eb5d4a307e7acd6dedf3cda67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt_nt0}AsNnZryb;NHsEnB)Ss&! zxxk!l#V)tyFQr783z8dCM2Y9U%!|d>sx1QEI4|9%a4D>=DA5% z)aL0)br{-hx$t?_4a=n^>CDMPBJNLbwf7V@0rrfgTe~DWM4fa*K06 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 c3c626f98275a83c20034589368175a30c3c930b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)%ZvCWr;FfN=s?z_&pgVLvEI=3{4HAb{!Vp=2EI<|@3y=jq z5HN8y#=U@_Jof?`KO(=>R5=I*)IUdI6cCaeHP(UxG^mGE69t4c4UM&+01fIP)kFay lO+#ZXC_saHNHxtX;0gV_-a&E?BpUz#002ovPDHLkV1o7%oYMdR 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 3ee17a7ef390839e2961bfa9249ae2ac9c45a8f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^tRT$61|)m))t&+=wj^(N7l!{JxM1({$v_d#0*}aI z1_r)^Ak4U9V)k30AbW|YuPggqZZ;+{qvtHYmjZ>XJzX3_IIf5G9OONqAaGdbS_1F3 zg!_31rPd_My;Zy#WVdnB3I>%xUWbrlo8y_++|2aM3*0j6&kwt`D`YOJOZ_^_!2bkj O41=eupUXO@geCwYY&aGG 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 daca8b722712f3bbe35e2bbf38049b10bddc2978..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^~!3HEt`|kO_w 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 18843e648c62d38b4714a3da57fc69ae409de8fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 722 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V4CUa;uum9_jaar-fagFSKpPV zm{?3d$+4^~e%-s|6xW?yMYBbBoN}6Ew(iT#=Bpf04qBeiSkx3)3O{&Eu&X#Hn6P8! zOzpd$_1cZs@A}ki6|nGCS3Dt9GsZzwY##&p-df{Qtf0X3o4@>yMrDnA&hN=Ub-H%sZyX{%6KA7Fx*c zdsntQe$Cp#uOST6PCu>9{q%lS{p(1ZTxh=l z^zQd$RtWmrJ9B2x1hxZ78!K{x*S`Mx%X{|6D-nzV=k~u^#(3eGV90(|+x20qMWhR* z81fDkgml-au+Chy|IacLPL23&GDntOet9=Ky)o%u-TvK}DRW{aYQj^cs`L9f`^hIp(xt};k zc4N80&-#fTn>p)46qp)Layc+;VBWBYQ^28`{Y}T#?`x(@mK~|uxbe5r#MK - - - - - - - - - - - - - - \ 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