From 8a58fe9f8c66360a83d00ad9e2b08498b3e0e091 Mon Sep 17 00:00:00 2001 From: anthony restaino Date: Fri, 9 Jun 2017 20:39:51 -0400 Subject: [PATCH] Cleaning up History and Download Items --- .../browser/lightning/database/HistoryItem.java | 15 ++++++--------- .../database/downloads/DownloadItem.java | 12 ++++-------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/acr/browser/lightning/database/HistoryItem.java b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java index 9021e73..9c0a041 100644 --- a/app/src/main/java/acr/browser/lightning/database/HistoryItem.java +++ b/app/src/main/java/acr/browser/lightning/database/HistoryItem.java @@ -11,21 +11,18 @@ import acr.browser.lightning.utils.Preconditions; public class HistoryItem implements Comparable { - // private variables - @NonNull - private String mUrl = ""; + @NonNull private String mUrl = ""; - @NonNull - private String mTitle = ""; + @NonNull private String mTitle = ""; - @NonNull - private String mFolder = ""; + @NonNull private String mFolder = ""; - @Nullable - private Bitmap mBitmap = null; + @Nullable private Bitmap mBitmap = null; private int mImageId = 0; + private int mPosition = 0; + private boolean mIsFolder = false; public HistoryItem() {} diff --git a/app/src/main/java/acr/browser/lightning/database/downloads/DownloadItem.java b/app/src/main/java/acr/browser/lightning/database/downloads/DownloadItem.java index 90025ba..eb06c6e 100644 --- a/app/src/main/java/acr/browser/lightning/database/downloads/DownloadItem.java +++ b/app/src/main/java/acr/browser/lightning/database/downloads/DownloadItem.java @@ -10,15 +10,11 @@ import acr.browser.lightning.utils.Preconditions; public class DownloadItem implements Comparable { - // private variables - @NonNull - private String mUrl = ""; + @NonNull private String mUrl = ""; - @NonNull - private String mTitle = ""; + @NonNull private String mTitle = ""; - @NonNull - private String mContentSize = ""; + @NonNull private String mContentSize = ""; public DownloadItem() {} @@ -83,7 +79,7 @@ public class DownloadItem implements Comparable { DownloadItem that = (DownloadItem) object; return this.mTitle.equals(that.mTitle) && this.mUrl.equals(that.mUrl) - && this.mContentSize.equals(that.mContentSize); + && this.mContentSize.equals(that.mContentSize); } @Override