Add dex counter, fixed new bugs in bookmarks, fixed bug in bookmark sync, todo fix downloading bug

app/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
+apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
     compileSdkVersion 23
@@ -43,6 +44,14 @@ android {
     }
 }
 
+dexcount {
+    includeClasses = false
+    includeFieldCount = false
+    printAsTree = true
+    orderByMethodCount = true
+    verbose = false
+}
+
 dependencies {
     compile 'com.android.support:palette-v7:23.0.1'
     compile 'com.android.support:appcompat-v7:23.0.1'
@@ -54,7 +63,6 @@ dependencies {
     apt 'com.google.dagger:dagger-compiler:2.0.1'
     compile 'com.jakewharton:butterknife:7.0.1'
 
-    // Only Lightning Plus needs the proxy libraries
     compile 'net.i2p.android:client:0.7'
 
     // Use the following code to update the libnetcipher submodule
@@ -66,4 +74,5 @@ dependencies {
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1'
 
     provided 'javax.annotation:jsr250-api:1.0'
+
 }

app/src/main/java/acr/browser/lightning/database/BookmarkLocalSync.java

@@ -72,7 +72,7 @@ public class BookmarkLocalSync {
         if (!isChromeSupported()) {
             return list;
         }
-        Cursor cursor = getStockCursor();
+        Cursor cursor = getChromeCursor();
         try {
             if (cursor != null) {
                 for (int n = 0; n < cursor.getColumnCount(); n++) {

app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java

@@ -257,11 +257,8 @@ public class LightningDialogBuilder {
                         eventBus.post(new BrowserEvents.OpenUrlInCurrentTab(url));
                         break;
                     case DialogInterface.BUTTON_NEUTRAL:
-                        if (Build.VERSION.SDK_INT > 8) {
-                            // Should be better to send an event on the bus here
                             Utils.downloadFile(activity, url,
                                     userAgent, "attachment");
-                        }
                         break;
                 }
             }

app/src/main/java/acr/browser/lightning/download/LightningDownloadListener.java

@@ -12,6 +12,7 @@ import android.webkit.URLUtil;
 
 import acr.browser.lightning.R;
 import acr.browser.lightning.constant.Constants;
+import acr.browser.lightning.utils.PermissionsManager;
 
 public class LightningDownloadListener implements DownloadListener {
 
@@ -21,6 +22,7 @@ public class LightningDownloadListener implements DownloadListener {
         mContext = context;
     }
 
+    //TODO implement permissions for downloading
     @Override
     public void onDownloadStart(final String url, final String userAgent,
             final String contentDisposition, final String mimetype, long contentLength) {

app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java

@@ -298,7 +298,7 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener,
         if (item.isFolder()) {
             mBookmarksDialogBuilder.showBookmarkFolderLongPressedDialog(getContext(), item);
         } else {
-            mBookmarksDialogBuilder.showLongPressLinkDialog(getContext(), item.getUrl());
+            mBookmarksDialogBuilder.showLongPressedDialogForBookmarkUrl(getContext(), item);
         }
     }
 

app/src/main/java/acr/browser/lightning/view/LightningView.java

@@ -609,10 +609,10 @@ public class LightningView {
                 }
             } else if (currentUrl.endsWith(Constants.BOOKMARKS_FILENAME)) {
                 if (url != null) {
-                    bookmarksDialogBuilder.showLongPressLinkDialog(mActivity, url);
+                    bookmarksDialogBuilder.showLongPressedDialogForBookmarkUrl(mActivity, url);
                 } else if (result != null && result.getExtra() != null) {
                     final String newUrl = result.getExtra();
-                    bookmarksDialogBuilder.showLongPressLinkDialog(mActivity, newUrl);
+                    bookmarksDialogBuilder.showLongPressedDialogForBookmarkUrl(mActivity, newUrl);
                 }
             }
         } else {

build.gradle

@@ -1,4 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
         jcenter()
@@ -6,6 +5,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:1.3.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.7'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.2.1'
     }
 }