From b822573a2fdfacaa03d2e0b98070841f3e9a68c6 Mon Sep 17 00:00:00 2001
From: Anthony Restaino <anthonyrestaino11@gmail.com>
Date: Sat, 2 Aug 2014 21:21:42 -0400
Subject: [PATCH] Layout updates

---
 res/layout/activity_main.xml                   | 13 +++++--------
 src/acr/browser/lightning/BrowserActivity.java | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 47a4fa5..ab929af 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -78,8 +78,7 @@
                     android:minHeight="?android:attr/listPreferredItemHeightSmall"
                     android:text="@string/action_new_tab"
                     android:textAppearance="?android:attr/textAppearanceListItemSmall"
-                    android:textColor="@color/black"
-                    android:textStyle="bold" />
+                    android:textColor="@color/black" />
             </RelativeLayout>
 
             <View
@@ -87,7 +86,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="1dp"
                 android:layout_below="@+id/new_tab_button"
-                android:background="#bababa" />
+                android:background="@color/gray_list_bg" />
 
             <ListView
                 android:id="@+id/left_drawer"
@@ -104,7 +103,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="1dp"
                 android:layout_above="@+id/linearLayout1"
-                android:background="#bababa" />
+                android:background="@color/gray_list_bg" />
 
             <LinearLayout
                 android:id="@+id/linearLayout1"
@@ -170,7 +169,6 @@
                 android:id="@+id/bookmark_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
                 android:background="@drawable/list_bg"
                 android:gravity="center_vertical"
                 android:orientation="horizontal" >
@@ -201,14 +199,13 @@
                     android:minHeight="?android:attr/listPreferredItemHeightSmall"
                     android:text="@string/action_bookmarks"
                     android:textAppearance="?android:attr/textAppearanceListItemSmall"
-                    android:textColor="@color/black"
-                    android:textStyle="bold" />
+                    android:textColor="@color/black" />
             </RelativeLayout>
 
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="1dp"
-                android:background="#bababa" />
+                android:background="@color/gray_list_bg" />
 
             <ListView
                 android:id="@+id/right_drawer_list"
diff --git a/src/acr/browser/lightning/BrowserActivity.java b/src/acr/browser/lightning/BrowserActivity.java
index 7689a0d..424342b 100644
--- a/src/acr/browser/lightning/BrowserActivity.java
+++ b/src/acr/browser/lightning/BrowserActivity.java
@@ -55,8 +55,10 @@ import info.guardianproject.onionkit.ui.OrbotHelper;
 import info.guardianproject.onionkit.web.WebkitProxy;
 
 import java.io.*;
+import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.net.URLEncoder;
 import java.util.*;
 
@@ -1606,7 +1608,11 @@ public class BrowserActivity extends Activity implements BrowserController {
 			if (!image.exists()) {
 				try {
 					// if not, download it...
-					InputStream in = new java.net.URL(urldisplay).openStream();
+					URL url = new URL(urldisplay);
+					HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+					connection.setDoInput(true);
+					connection.connect();
+					InputStream in = connection.getInputStream();
 
 					if (in != null) {
 						mIcon = BitmapFactory.decodeStream(in);
@@ -1614,12 +1620,15 @@ public class BrowserActivity extends Activity implements BrowserController {
 					// ...and cache it
 					if (mIcon != null) {
 						FileOutputStream fos = new FileOutputStream(image);
-						mIcon.compress(Bitmap.CompressFormat.PNG, 85, fos);
+						mIcon.compress(Bitmap.CompressFormat.PNG, 100, fos);
 						fos.flush();
 						fos.close();
+						Log.i(Constants.TAG, "Downloaded: " + urldisplay);
 					}
 
 				} catch (Exception e) {
+				} finally {
+					
 				}
 			} else {
 				// if it exists, retrieve it from the cache
@@ -1638,7 +1647,7 @@ public class BrowserActivity extends Activity implements BrowserController {
 					// ...and cache it
 					if (mIcon != null) {
 						FileOutputStream fos = new FileOutputStream(image);
-						mIcon.compress(Bitmap.CompressFormat.PNG, 85, fos);
+						mIcon.compress(Bitmap.CompressFormat.PNG, 100, fos);
 						fos.flush();
 						fos.close();
 					}
@@ -1690,7 +1699,7 @@ public class BrowserActivity extends Activity implements BrowserController {
 			animator.setDuration(200);
 			animator.setInterpolator(new DecelerateInterpolator());
 			animator.start();
-		} else {
+		} else if (n < mProgressBar.getProgress()) {
 			ObjectAnimator animator = ObjectAnimator.ofInt(mProgressBar, "progress", 0, n);
 			animator.setDuration(200);
 			animator.setInterpolator(new DecelerateInterpolator());