NClientV2 2.2.7

* Bug fixes

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.dar.nclientv2"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 226
-        versionName "2.2.6"
+        versionCode 227
+        versionName "2.2.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 

app/src/main/java/com/dar/nclientv2/adapters/GalleryAdapter.java

@@ -146,8 +146,12 @@ public GenericGallery getGallery(){
 
     private void loadRelatedLayout(ViewHolder holder){
         LogUtility.d("Called RElated");
-        final RecyclerView recyclerView=(RecyclerView)holder.master;
+        final RecyclerView recyclerView= holder.master.findViewById(R.id.recycler);
         final Gallery gallery=(Gallery)this.gallery;
+        if(!gallery.isRelatedLoaded()||gallery.getRelated().size()==0){
+            holder.master.setVisibility(View.GONE);
+            return;
+        }else holder.master.setVisibility(View.VISIBLE);
         recyclerView.setLayoutManager(new CustomGridLayoutManager(context,1,RecyclerView.HORIZONTAL,false));
         if(gallery.isRelatedLoaded()){
             ListAdapter adapter=new ListAdapter(context);

app/src/main/java/com/dar/nclientv2/api/InspectorV3.java

@@ -156,6 +156,8 @@ public static InspectorV3 favoriteInspector(Context context,String query, int pa
      * @param favorite true if random online favorite, false for general random manga
      * */
     public static InspectorV3 randomInspector(Context context,InspectorResponse response,boolean favorite){
+        if(!favorite&&Global.useAlternativeSite())
+            return InspectorV3.galleryInspector(context,Utility.RANDOM.nextInt(Global.getMaxId()),response);
         InspectorV3 inspector=new InspectorV3(context,response);
         inspector.requestType=favorite?ApiRequestType.RANDOM_FAVORITE:ApiRequestType.RANDOM;
         inspector.createUrl();

app/src/main/java/com/dar/nclientv2/api/SimpleGallery.java

@@ -4,6 +4,8 @@
 import android.database.Cursor;
 import android.os.Parcel;
 
+import androidx.annotation.NonNull;
+
 import com.dar.nclientv2.api.components.Comment;
 import com.dar.nclientv2.api.components.Gallery;
 import com.dar.nclientv2.api.components.GenericGallery;
@@ -102,6 +104,7 @@ public boolean isValid() {
     }
 
     @Override
+    @NonNull
     public String getTitle() {
         return title;
     }

app/src/main/java/com/dar/nclientv2/api/components/Gallery.java

@@ -51,7 +51,7 @@ public Gallery(Context context, String json, Elements comments, Elements related
     }
     @NonNull
     public String getPathTitle() {
-        return getSafeTitle().replace('/', '_').replaceAll("[|\\\\?*<\":>+\\[\\]/']", "_");
+        return getTitle().replace('/', '_').replaceAll("[|\\\\?*<\":>+\\[\\]/']", "_");
     }
 
     private Date uploadDate;
@@ -94,6 +94,7 @@ public Gallery(Cursor cursor, TagList tags) throws IOException{
         complete=true;
         //The gallery is added to DB only for local favorite and download
         onlineFavorite=false;
+        LogUtility.d(toString());
     }
 
     public boolean isOnlineFavorite() {
@@ -453,9 +454,15 @@ private void readTitles(JsonReader jr) throws IOException {
     public String getFilename(int page){
         return String.format(Locale.US,"%03d.%s",page,getPageExtension(page));
     }
+    @NonNull
     @Override
     public String getTitle() {
-        return getTitle(Global.getTitleType());
+        String x=getTitle(Global.getTitleType());
+        if(x.length()>2)return x;
+        if((x=getTitle(TitleType.PRETTY)).length()>2)return x;
+        if((x=getTitle(TitleType.ENGLISH)).length()>2)return x;
+        if((x=getTitle(TitleType.JAPANESE)).length()>2)return x;
+        return "Unnamed";
     }
 
     public String getTitle(int x){
@@ -467,15 +474,6 @@ public String getTitle(int x){
     public String getTitle(TitleType x){
         return getTitle(x.ordinal());
     }
-    @NonNull
-    public String getSafeTitle(){
-        String x=getTitle();
-        if(x.length()>2)return x;
-        if((x=getTitle(TitleType.ENGLISH)).length()>2)return x;
-        if((x=getTitle(TitleType.PRETTY)).length()>2)return x;
-        if((x=getTitle(TitleType.JAPANESE)).length()>2)return x;
-        return "Unnamed";
-    }
 
     public Language getLanguage() {
         return language;

app/src/main/java/com/dar/nclientv2/api/components/GenericGallery.java

@@ -2,6 +2,8 @@
 
 import android.os.Parcelable;
 
+import androidx.annotation.NonNull;
+
 import com.dar.nclientv2.components.classes.Size;
 import com.dar.nclientv2.utility.Utility;
 
@@ -16,6 +18,7 @@ public enum Type{COMPLETE,LOCAL,SIMPLE}
     public abstract Type getType();
     public abstract int getPageCount();
     public abstract boolean isValid();
+    @NonNull
     public abstract String getTitle();
     public abstract List<Comment> getComments();
     public abstract Size getMaxSize();

app/src/main/java/com/dar/nclientv2/api/local/LocalGallery.java

@@ -22,7 +22,7 @@ public class LocalGallery extends GenericGallery{
     private final String title;
     private final File directory;
     private final boolean valid;
-    private static final Pattern FILE_PATTERN=Pattern.compile("^(\\d{3,9})\\.(gif|png|jpg|jpeg)$",Pattern.CASE_INSENSITIVE);
+    private static final Pattern FILE_PATTERN=Pattern.compile("^(\\d{3,9})\\.(gif|png|jpg)$",Pattern.CASE_INSENSITIVE);
     private Size maxSize=new Size(0,0),minSize=new Size(Integer.MAX_VALUE,Integer.MAX_VALUE);
     private File[]retriveValidFiles(){
         return directory.listFiles((dir, name) -> FILE_PATTERN.matcher(name).matches());
@@ -124,6 +124,7 @@ public int getPageCount() {
         return max;
     }
     @Override
+    @NonNull
     public String getTitle() {
         return title;
     }
@@ -149,8 +150,6 @@ public static File getPage(File dir,int page){
         if(x.exists())return x;
         x=new File(dir,pag+"gif");
         if(x.exists())return x;
-        x=new File(dir,pag+"jpeg");
-        if(x.exists())return x;
         return null;
     }
     @Nullable

app/src/main/java/com/dar/nclientv2/async/database/Queries.java

@@ -695,7 +695,7 @@ public static TagList getTagsForGallery(int id){
                     GalleryBridgeTable.TABLE_NAME,
                     TagTable.IDTAG,
                     GalleryBridgeTable.ID_TAG,
-                    GalleryBridgeTable.ID_TAG,
+                    GalleryBridgeTable.ID_GALLERY,
                     id
                     );
             TagList tagList=new TagList();

app/src/main/java/com/dar/nclientv2/async/downloader/GalleryDownloaderV2.java

@@ -190,9 +190,11 @@ private void downloadPage(PageContainer page) {
         }
     }
     private boolean isCorrupted(File file){
+        String path=file.getAbsolutePath();
+        if(path.endsWith(".jpg")&&Global.isJPEGCorrupted(path))return true;
         BitmapFactory.Options options=new BitmapFactory.Options();
         options.inSampleSize=256;
-        Bitmap bitmap=BitmapFactory.decodeFile(file.getAbsolutePath(),options);
+        Bitmap bitmap=BitmapFactory.decodeFile(path,options);
         boolean x= bitmap==null;
         if(!x)bitmap.recycle();
         bitmap = null;
@@ -206,25 +208,38 @@ private boolean savePage(PageContainer page) {
             Response r = Global.getClient(context).newCall(new Request.Builder().url(page.url).build()).execute();
             if (r.code() != 200) {r.close();return false;}
             assert r.body() != null;
-            writeStreamToFile(r.body().byteStream(), filePath);
+            long expectedSize=Integer.parseInt(r.header("Content-Length","-1"));
+            long len=r.body().contentLength();
+            if(len < 0 || expectedSize != len){
+                r.close();
+                return false;
+            }
+            long written=writeStreamToFile(r.body().byteStream(), filePath);
             r.close();
+            if(written!=len){
+                filePath.delete();
+                return false;
+            }
             return true;
-        }catch (IOException e){
+        }catch (IOException|NumberFormatException e){
             LogUtility.e(e,e);
         }
         return false;
     }
 
-    private void writeStreamToFile(InputStream inputStream, File filePath)throws IOException {
+    private long writeStreamToFile(InputStream inputStream, File filePath)throws IOException {
         FileOutputStream outputStream=new FileOutputStream(filePath);
         int read;
+        long totalByte=0;
         byte[] bytes = new byte[1024];
         while ((read = inputStream.read(bytes)) != -1) {
             outputStream.write(bytes, 0, read);
+            totalByte+=read;
         }
         outputStream.flush();
         outputStream.close();
         inputStream.close();
+        return totalByte;
     }
 
     public void initDownload() {

app/src/main/java/com/dar/nclientv2/settings/Global.java

@@ -483,7 +483,7 @@ public static boolean hasStoragePermission(Context context) {
         return Build.VERSION.SDK_INT < Build.VERSION_CODES.M ||ContextCompat.checkSelfPermission(context,Manifest.permission.WRITE_EXTERNAL_STORAGE)==PackageManager.PERMISSION_GRANTED;
     }
 
-    public static boolean isCorrupted(String path){
+    public static boolean isJPEGCorrupted(String path){
         if(!new File(path).exists())return true;
         try (RandomAccessFile fh = new RandomAccessFile(path, "r")) {
             long length = fh.length();

app/src/main/java/com/dar/nclientv2/utility/Utility.java

@@ -26,14 +26,14 @@
 
 public class Utility {
     public static final Random RANDOM=new Random(System.nanoTime());
-    private static final String BASE_URL="nhentai.net";
+    private static final String ORIGINAL_URL ="nhentai.net";
     private static final String ALTERNATIVE_URL="nhent.ai";
     public static String getBaseUrl(){
         return "https://"+Utility.getHost()+"/";
     }
     public static String getHost(){
         boolean x=Global.useAlternativeSite();
-        return x?ALTERNATIVE_URL:BASE_URL;
+        return x?ALTERNATIVE_URL: ORIGINAL_URL;
     }
     public static void threadSleep(long millis){
         try {
@@ -49,7 +49,6 @@ public static void tintMenu(Menu menu){
             LogUtility.d("Item "+i+": "+item.getItemId()+"; "+item.getTitle());
             Global.setTint(item.getIcon());
         }
-        LogUtility.d("\n\n");
     }
     @Nullable
     private static Bitmap drawableToBitmap(Drawable dra){

app/src/main/res/layout/image_void_static.xml

@@ -23,7 +23,7 @@
             android:backgroundTint="?attr/colorPrimaryVariant"
             android:contentDescription="@string/image"
             android:scaleType="fitCenter"
-            app:layout_constraintDimensionRatio="W,16:9"
+            app:layout_constraintDimensionRatio="3:4"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"

app/src/main/res/layout/related_recycler.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:id="@+id/master"
     xmlns:android="http://schemas.android.com/apk/res/android" >
     <TextView
         style="@style/TextAppearance.MaterialComponents.Headline5"
@@ -11,7 +12,7 @@
         android:text="@string/related"
         android:layout_marginLeft="8dp" />
 <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/master"
+    android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"/>
 </LinearLayout>