From bfa12864e075a97aba8395bcb6de4253be868914 Mon Sep 17 00:00:00 2001
From: Dar9586 <atoppi2012@libero.it>
Date: Thu, 17 Jan 2019 17:00:10 +0100
Subject: [PATCH] NClientV2 1.6.7 * Bug fixes

---
 app/build.gradle                              |  4 ++--
 .../java/com/dar/nclientv2/ZoomActivity.java  | 20 +++++++++++--------
 build.gradle                                  |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e72cd57d..79f87e98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.dar.nclientv2"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 166
-        versionName "1.6.6"
+        versionCode 167
+        versionName "1.6.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
diff --git a/app/src/main/java/com/dar/nclientv2/ZoomActivity.java b/app/src/main/java/com/dar/nclientv2/ZoomActivity.java
index 5f85bf5a..f2e761eb 100644
--- a/app/src/main/java/com/dar/nclientv2/ZoomActivity.java
+++ b/app/src/main/java/com/dar/nclientv2/ZoomActivity.java
@@ -25,6 +25,7 @@
 import com.dar.nclientv2.components.CustomViewPager;
 import com.dar.nclientv2.settings.Global;
 import com.github.chrisbanes.photoview.PhotoView;
+import com.squareup.picasso.Picasso;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -41,6 +42,8 @@
 
 public class ZoomActivity extends AppCompatActivity {
     private GenericGallery gallery;
+    public int actualPage=0;
+    private static final Object preloadTag=new Object();
     private final static int hideFlags=View.SYSTEM_UI_FLAG_LAYOUT_STABLE
             | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
             | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
@@ -88,14 +91,16 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
 
             @Override
             public void onPageSelected(int position) {
+                actualPage=position;
                 pageManager.setText(getString(R.string.page_format,position+1,gallery.getPageCount()));
                 seekBar.setProgress(position);
-                if(!gallery.isLocal()){
+                /*if(!gallery.isLocal()){
+                    Picasso.get().cancelTag(preloadTag);
                     Gallery gallery=(Gallery)ZoomActivity.this.gallery;
-                    if(position<gallery.getPageCount()-1)Global.preloadImage(gallery.getPage(position+1));
-                    if(position>0)Global.preloadImage(gallery.getPage(position-1));
+                    if(position>0)Picasso.get().load(gallery.getPage(position-1)).tag(preloadTag).priority(Picasso.Priority.LOW).fetch();
+                    if(position<gallery.getPageCount()-1)Picasso.get().load(gallery.getPage(position+1)).tag(preloadTag).priority(Picasso.Priority.LOW).fetch();
 
-                }
+                }*/
             }
 
             @Override
@@ -267,11 +272,10 @@ public void onAnimationEnd(Animator animation) {
             int page=getArguments().getInt("PAGE",0);
             File file=x.directory==null?null:new File(x.directory,("000"+(page+1)+".jpg").substring(Integer.toString(page+1).length()));
             if(file==null||!file.exists()){
-                if(x.gallery.isLocal())Global.loadImage(R.mipmap.ic_launcher,photoView);
-                else Global.loadImage(((Gallery)x.gallery).getPage(page),photoView,true);
-
+                if(x.gallery.isLocal())Picasso.get().load(R.mipmap.ic_launcher).into(photoView);
+                else Picasso.get().load(((Gallery)x.gallery).getPage(page)).into(photoView);
             }
-            else Global.loadImage(file,photoView);
+            else Picasso.get().load(file).into(photoView);
             return rootView;
         }
     }
diff --git a/build.gradle b/build.gradle
index 66c658a7..fa9f5692 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         
 
         // NOTE: Do not place your application dependencies here; they belong