Fix global change in night mode #2

Fix whitespaces in folder name Dar9586/NClientV2#371 Added .torrent download and open Dar9586/NClientV2#374 Bug fix
aha1008 · Jan 30, 2023 · d51956d · d51956d
1 parent d116123
commit d51956d
Show file tree

Hide file tree

Showing 18 changed files with 96 additions and 42 deletions.
diff --git a/app/src/main/java/com/dar/nclientv2/GalleryActivity.java b/app/src/main/java/com/dar/nclientv2/GalleryActivity.java
@@ -24,6 +24,7 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.FileProvider;
 
 import com.dar.nclientv2.adapters.GalleryAdapter;
 import com.dar.nclientv2.api.InspectorV3;
@@ -46,6 +47,7 @@
 
 import net.opacapp.multilinecollapsingtoolbar.CollapsingToolbarLayout;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
@@ -253,12 +255,9 @@ private void menuItemsVisible(Menu menu) {
         menu.findItem(R.id.related).setVisible(isValidOnline);
         menu.findItem(R.id.comments).setVisible(isValidOnline);
 
+        menu.findItem(R.id.download_torrent).setVisible(isLogged);
         menu.findItem(R.id.share).setVisible(gallery.isValid());
         menu.findItem(R.id.load_internet).setVisible(isLocal && gallery.isValid());
-
-        if (isValidOnline && isLogged) ;
-        //instantiateWebView();
-
     }
 
     @Override
@@ -278,6 +277,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 requestStorage();
         } else if (id == R.id.add_online_gallery) addToFavorite(item);
         else if (id == R.id.change_view) updateColumnCount(true);
+        else if (id == R.id.download_torrent) downloadTorrent();
         else if (id == R.id.load_internet) toInternet();
         else if (id == R.id.manage_status) updateStatus();
         else if (id == R.id.share) Global.shareGallery(this, gallery);
@@ -286,9 +286,6 @@ else if (id == R.id.comments) {
             i.putExtra(getPackageName() + ".GALLERYID", gallery.getId());
             startActivity(i);
         } else if (id == R.id.related) {
-            /*Intent intent = new Intent(this, MainActivity.class);
-            intent.putExtra(getPackageName() + ".RELATED", gallery.getId());
-            startActivity(intent);*/
             recycler.smoothScrollToPosition(recycler.getAdapter().getItemCount());
         } else if (id == R.id.favorite_manager) {
             if (isLocalFavorite) {
@@ -306,6 +303,41 @@ else if (id == R.id.comments) {
         return super.onOptionsItemSelected(item);
     }
 
+    private void downloadTorrent() {
+        if(!Global.hasStoragePermission(this)){
+            return;
+        }
+
+        String url = String.format(Locale.US, Utility.getBaseUrl() + "g/%d/download", gallery.getId());
+        String referer = String.format(Locale.US, Utility.getBaseUrl() + "g/%d/", gallery.getId());
+
+        new AuthRequest(referer, url, new Callback() {
+            @Override
+            public void onFailure(@NonNull Call call,@NonNull  IOException e) {
+                GalleryActivity.this.runOnUiThread(() ->
+                    Toast.makeText(GalleryActivity.this, R.string.failed, Toast.LENGTH_SHORT).show()
+                );
+            }
+
+            @Override
+            public void onResponse(@NonNull Call call,@NonNull Response response) throws IOException {
+                File file=new File(Global.TORRENTFOLDER,gallery.getId()+".torrent");
+                Utility.writeStreamToFile(response.body().byteStream(), file);
+                Intent intent=new Intent(Intent.ACTION_VIEW);
+                Uri torrentUri;
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    torrentUri = FileProvider.getUriForFile(GalleryActivity.this, GalleryActivity.this.getPackageName() + ".provider", file);
+                    intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+                }else{
+                    torrentUri=Uri.fromFile(file);
+                }
+                intent.setDataAndType(torrentUri, "application/x-bittorrent");
+                GalleryActivity.this.startActivity(intent);
+                file.deleteOnExit();
+            }
+        }).setMethod("GET",null).start();
+    }
+
     private void updateStatus() {
         List<String> statuses = StatusManager.getNames();
         MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);

diff --git a/app/src/main/java/com/dar/nclientv2/adapters/LocalAdapter.java b/app/src/main/java/com/dar/nclientv2/adapters/LocalAdapter.java
@@ -110,10 +110,12 @@ public void triggerUpdateProgress(GalleryDownloaderV2 downloader, int reach, int
         public void triggerEndDownload(GalleryDownloaderV2 downloader) {
             LocalGallery l = downloader.localGallery();
             galleryDownloaders.remove(downloader);
-            dataset.remove(l);
-            dataset.add(l);
-            LogUtility.d(l);
-            sortElements();
+            if(l!=null) {
+                dataset.remove(l);
+                dataset.add(l);
+                LogUtility.d(l);
+                sortElements();
+            }
             context.runOnUiThread(() -> notifyItemRangeChanged(0, getItemCount()));
         }
 

diff --git a/app/src/main/java/com/dar/nclientv2/api/components/Gallery.java b/app/src/main/java/com/dar/nclientv2/api/components/Gallery.java
@@ -105,7 +105,7 @@ public static String getPathTitle(@Nullable String title, @NonNull String defaul
         String pathTitle = title.replace('/', ' ').replaceAll("[/|\\\\*\"'?:<>]", " ");
         while (pathTitle.contains("  "))
             pathTitle = pathTitle.replace("  ", " ");
-        return pathTitle;
+        return pathTitle.trim();
     }
 
     public static String getPathTitle(@Nullable String title) {

diff --git a/app/src/main/java/com/dar/nclientv2/async/VersionChecker.java b/app/src/main/java/com/dar/nclientv2/async/VersionChecker.java
@@ -204,6 +204,9 @@ public void onFailure(@NonNull Call call, @NonNull IOException e) {
             @Override
             public void onResponse(@NonNull Call call, @NonNull Response response) throws IOException {
                 context.getSharedPreferences("Settings", 0).edit().putBoolean("downloaded", false).apply();
+                                if (Global.UPDATEFOLDER == null) {
+                    Global.initStorage(context);
+                }
                 Global.UPDATEFOLDER.mkdirs();
                 f.createNewFile();
                 FileOutputStream stream = new FileOutputStream(f);

diff --git a/app/src/main/java/com/dar/nclientv2/async/downloader/GalleryDownloaderV2.java b/app/src/main/java/com/dar/nclientv2/async/downloader/GalleryDownloaderV2.java
@@ -18,10 +18,10 @@
 import com.dar.nclientv2.utility.Utility;
 
 import java.io.File;
-import java.io.FileOutputStream;
+
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -277,7 +277,7 @@ private boolean savePage(PageContainer page) {
                 r.close();
                 return false;
             }
-            long written = writeStreamToFile(r.body().byteStream(), filePath);
+            long written = Utility.writeStreamToFile(r.body().byteStream(), filePath);
             r.close();
             if (written != len) {
                 filePath.delete();
@@ -290,20 +290,7 @@ private boolean savePage(PageContainer page) {
         return false;
     }
 
-    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() {
         if (initialized) return;

diff --git a/app/src/main/java/com/dar/nclientv2/components/views/ZoomFragment.java b/app/src/main/java/com/dar/nclientv2/components/views/ZoomFragment.java
@@ -121,8 +121,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         });
 
         photoView.setOnScaleChangeListener((float scaleFactor, float focusX, float focusY)->{
-            this.zoomChangeListener.onZoomChange(rootView, photoView.getScale());
-        });
+        if(this.zoomChangeListener!=null) {
+                this.zoomChangeListener.onZoomChange(rootView, photoView.getScale());    
 
         photoView.setMaximumScale(MAX_SCALE);
         retryButton.setOnClickListener(v -> loadImage());

diff --git a/app/src/main/java/com/dar/nclientv2/settings/Global.java b/app/src/main/java/com/dar/nclientv2/settings/Global.java
@@ -4,7 +4,7 @@
 import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
-import android.app.UiModeManager;
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -67,6 +67,7 @@ public class Global {
     private static final String PDFFOLDER_NAME = "PDF";
     private static final String UPDATEFOLDER_NAME = "Update";
     private static final String ZIPFOLDER_NAME = "ZIP";
+    private static final String TORRENTFOLDER_NAME = "Torrents";
     private static final String BACKUPFOLDER_NAME = "Backup";
     private static final DisplayMetrics lastDisplay = new DisplayMetrics();
     public static OkHttpClient client = null;
@@ -76,6 +77,7 @@ public class Global {
     public static File SCREENFOLDER;
     public static File PDFFOLDER;
     public static File UPDATEFOLDER;
+    public static File TORRENTFOLDER;
     public static File ZIPFOLDER;
     public static File BACKUPFOLDER;
     private static Language onlyLanguage;
@@ -164,7 +166,6 @@ public static String getDefaultFileParent(Context context) {
         }
         return f.getAbsolutePath();
     }
-
     private static void initFilesTree(Context context) {
         List<File> files = getUsableFolders(context);
         String path = context.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString(context.getString(R.string.key_save_path), getDefaultFileParent(context));
@@ -174,12 +175,14 @@ private static void initFilesTree(Context context) {
         if (!files.contains(ROOTFOLDER) && !isExternalStorageManager())
             ROOTFOLDER = new File(getDefaultFileParent(context));
         MAINFOLDER = new File(ROOTFOLDER, MAINFOLDER_NAME);
+        LogUtility.d(MAINFOLDER);
         OLD_GALLERYFOLDER = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), MAINFOLDER_NAME);
         DOWNLOADFOLDER = new File(MAINFOLDER, DOWNLOADFOLDER_NAME);
         SCREENFOLDER = new File(MAINFOLDER, SCREENFOLDER_NAME);
         PDFFOLDER = new File(MAINFOLDER, PDFFOLDER_NAME);
         UPDATEFOLDER = new File(MAINFOLDER, UPDATEFOLDER_NAME);
         ZIPFOLDER = new File(MAINFOLDER, ZIPFOLDER_NAME);
+        TORRENTFOLDER = new File(MAINFOLDER, TORRENTFOLDER_NAME);
         BACKUPFOLDER = new File(MAINFOLDER, BACKUPFOLDER_NAME);
     }
 
@@ -551,6 +554,7 @@ public static void initStorage(Context context) {
             Global.UPDATEFOLDER.mkdir(),
             Global.SCREENFOLDER.mkdir(),
             Global.ZIPFOLDER.mkdir(),
+            Global.TORRENTFOLDER.mkdir(),
             Global.BACKUPFOLDER.mkdir(),
         };
         LogUtility.d(
@@ -561,6 +565,7 @@ public static void initStorage(Context context) {
                 "4:" + Global.UPDATEFOLDER + bools[3] + '\n' +
                 "5:" + Global.SCREENFOLDER + bools[4] + '\n' +
                 "5:" + Global.ZIPFOLDER + bools[5] + '\n' +
+                "5:" + Global.TORRENTFOLDER + bools[5] + '\n' +
                 "6:" + Global.BACKUPFOLDER + bools[6] + '\n'
         );
 
@@ -714,9 +719,6 @@ public static File findGalleryFolder(Context context, int id) {
 
     private static void updateConfigurationNightMode(AppCompatActivity activity, Configuration c) {
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-        UiModeManager manager = (UiModeManager) activity.getSystemService(Context.UI_MODE_SERVICE);
-        if (manager != null) manager.setNightMode(UiModeManager.MODE_NIGHT_NO);
-
         c.uiMode &= (~Configuration.UI_MODE_NIGHT_MASK);//clear night mode bits
         c.uiMode |= Configuration.UI_MODE_NIGHT_NO; //disable night mode
     }

diff --git a/app/src/main/java/com/dar/nclientv2/utility/Utility.java b/app/src/main/java/com/dar/nclientv2/utility/Utility.java
@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -123,6 +124,21 @@ private static void saveImage(@NonNull Bitmap bitmap, @NonNull File output) {
         }
     }
 
+    public static 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 static void sendImage(Context context, Drawable drawable, String text) {
         context = context.getApplicationContext();
         try {

diff --git a/app/src/main/res/menu/gallery.xml b/app/src/main/res/menu/gallery.xml
@@ -32,6 +32,7 @@
         android:orderInCategory="400"
         android:title="@string/download_gallery"
         app:showAsAction="ifRoom|collapseActionView" />
+
     <item
         android:id="@+id/add_online_gallery"
         android:icon="@drawable/ic_star"
@@ -43,7 +44,11 @@
         android:orderInCategory="550"
         android:title="@string/change_status"
         app:showAsAction="never" />
-
+    <item
+        android:id="@+id/download_torrent"
+        android:orderInCategory="400"
+        android:title="@string/download_torrent"
+        app:showAsAction="never" />
     <item
         android:id="@+id/share"
         android:icon="@drawable/ic_share"

diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
@@ -324,5 +324,5 @@
     <string name="title_change_page_buttons">غيِّر الصفحة بالنقر على الصورة</string>
     <string name="export_finished">Export finished</string>
     <string name="import_finished">Import finished</string>
-
+    <string name="download_torrent">Download torrent</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -346,5 +346,5 @@
     <string name="title_change_page_buttons">Ändere Seite Klicke auf das Bild</string>
     <string name="export_finished">Export finished</string>
     <string name="import_finished">Import finished</string>
-
+    <string name="download_torrent">Download torrent</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -321,5 +321,6 @@
     <string name="title_change_page_buttons">Cambiar de página haciendo click en la imagen</string>
     <string name="export_finished">Export finished</string>
     <string name="import_finished">Import finished</string>
+    <string name="download_torrent">Download torrent</string>
 
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
@@ -346,5 +346,6 @@
     <string name="title_change_page_buttons">Cambia pagina cliccando sull\'immagine</string>
     <string name="export_finished">Export finished</string>
     <string name="import_finished">Import finished</string>
+    <string name="download_torrent">Download torrent</string>
 
 </resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
@@ -297,7 +297,8 @@
     <string name="title_change_page_buttons">Перелистывание страницы нажатием на изображение</string>
     <string name="export_finished">Export finished</string>
     <string name="import_finished">Import finished</string>
-
+    <string name="download_torrent">Download torrent</string>
+
     <string-array name="scroll_type">
         <item>Горизонтальный</item>
         <item>Вертикальный</item>

diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
@@ -344,4 +344,5 @@
     <string name="title_change_page_buttons">Resme tıklayarak sayfa değiştir</string>
     <string name="export_finished">Export finished</string>
     <string name="import_finished">Import finished</string>
+    <string name="download_torrent">Download torrent</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -295,7 +295,8 @@
     <string name="title_change_page_buttons">Change page clicking on the image</string>
     <string name="export_finished">Export finished</string>
     <string name="import_finished">Import finished</string>
-
+    <string name="download_torrent">Download torrent</string>
+
     <string-array name="scroll_type">
         <item>水平</item>
         <item>垂直</item>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -350,6 +350,7 @@
     <string name="title_change_page_buttons">Change page clicking on the image</string>
     <string name="export_finished">Export finished</string>
     <string name="import_finished">Import finished</string>
+    <string name="download_torrent">Download torrent</string>
 
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -356,7 +356,8 @@
     <string name="title_change_page_buttons">Change page clicking on the image</string>
     <string name="export_finished">Export finished</string>
     <string name="import_finished">Import finished</string>
-
+    <string name="download_torrent">Download torrent</string>
+
     <string-array name="scroll_type">
         <item>Horizontal</item>
         <item>Vertical</item>