New model manager implementation pt. 1

Author: niedev

app/build.gradle

@@ -124,6 +124,7 @@ dependencies {
     implementation "androidx.preference:preference:1.1.0-alpha02"  //prima era 1.1.0-alpha02
     implementation "androidx.core:core-splashscreen:1.0.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
+    implementation "com.github.worker8:RadioGroupPlus:1.0.1"
     //Download library
     implementation 'com.github.amitshekhariitbhu:PRDownloader:1.0.2'
     // DJL HuggingFace tokenizers wrapper

app/src/main/java/nie/translator/rtranslator/access/DownloadFragment2.java

@@ -21,7 +21,6 @@
 import android.icu.text.DecimalFormat;
 import android.os.Bundle;
 import android.os.Looper;
-import android.telecom.Call;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -43,7 +42,6 @@
 import nie.translator.rtranslator.downloader2.DownloadInfo;
 import nie.translator.rtranslator.downloader2.DownloadInfoExtended;
 import nie.translator.rtranslator.downloader2.DownloadManager;
-import nie.translator.rtranslator.downloader2.Downloader2;
 
 public class DownloadFragment2 extends Fragment {
     @Nullable
@@ -229,7 +227,6 @@ public void onClick(View v) {
     public void onStart() {
         super.onStart();
         if(global != null && DOWNLOAD_INFOS != null) {
-            downloader.startService(); // we eventually start the service (if it is already started nothing will happen)
             //if the internal or external free memory are low, we show a warning
             double requiredSize = 0;
             for (DownloadInfo downloadInfo : DOWNLOAD_INFOS) {
@@ -263,6 +260,7 @@ public void onServiceConnected(){
                                         this.onProgress(downloadStatus.get(index), runningDownload, downloadStatus.get(index).getCurrentProgress(), runningDownload.getCurrentProgress(), runningDownload.isUnzipping(), runningDownload.isTestingIntegrity());
                                     }
                                 }
+                                //todo: manage the case where a download is paused
                             }
                         }
                     }
@@ -307,7 +305,7 @@ public void onError(DownloadGroupInfo downloadGroup, DownloadInfo download, int
                 }
             };
 
-            downloader.subscribe(callback);
+            downloader.subscribeAndResumeDownload(callback);
         }
     }
 

app/src/main/java/nie/translator/rtranslator/downloader2/DownloadManager.java

@@ -6,11 +6,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
 import android.os.IBinder;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
 import java.util.ArrayList;
 
 public class DownloadManager implements ServiceConnection {
@@ -20,8 +24,8 @@ public class DownloadManager implements ServiceConnection {
     @Nullable
     private DownloaderService downloaderService;
     private final Downloader2.ClientCallback serviceCallback;
-    private boolean serviceStarted = false;
-
+    private ArrayList<DownloadGroupInfo> downloadsToStart = new ArrayList<>();
+    private boolean shouldStartAllDownloads = false;
 
 
     public DownloadManager(Context context) {
@@ -58,25 +62,14 @@ public void onError(DownloadGroupInfo downloadGroup, DownloadInfo download, int
     }
 
     /**
-     * This method will start the download service and resume all the unfinished downloads
+     * This method will start the download service (if there are downloads to resume) and resume all the unfinished downloads
      */
-    public void startService(){
-        final Intent intent = new Intent(context, DownloaderService.class);
-        //intent.putExtra("notification", notification);
-        context.startService(intent);
-        this.serviceStarted = true;
-        if (callback != null) {   //if we have previously called subscribe before starting the service we will bind here
-            boolean result = context.bindService(new Intent(context, DownloaderService.class), this, BIND_ABOVE_CLIENT);
-            Log.d("bind download", result ? "success" : "failed");
-        }
-    }
-
-    public void subscribe(@Nullable Callback callback) {
+    public void subscribeAndResumeDownload(@Nullable Callback callback) {
         if(this.callback == null) {
             this.callback = callback;
-            if(serviceStarted) {  //if we have not started yet the service, we will bind after starting it, not now (this way the service will not stop when we unbind)
-                boolean result = context.bindService(new Intent(context, DownloaderService.class), this, BIND_ABOVE_CLIENT);
-                Log.d("bind download", result ? "success" : "failed");
+            boolean shouldStartService = areDownloadsRunning(false);
+            if(shouldStartService) {
+                startAndBindService();
             }
         }
     }
@@ -91,12 +84,15 @@ public void unsubscribe() {
         }
     }
 
-    public boolean startDownload(DownloadGroupInfo downloadGroup){
-        if(downloaderService != null) {
+    public void startDownload(DownloadGroupInfo downloadGroup){
+        if(downloaderService == null && !downloadsToStart.contains(downloadGroup)){
+            downloadsToStart.add(downloadGroup);
+            if(!DownloaderService.running){
+                startAndBindService();
+            }
+        }else if(downloaderService != null) {
             downloaderService.startDownload(downloadGroup);
-            return true;
         }
-        return false;
     }
 
     public boolean stopDownload(DownloadGroupInfo downloadGroup){
@@ -107,8 +103,21 @@ public boolean stopDownload(DownloadGroupInfo downloadGroup){
         return false;
     }
 
-    public boolean startAllDownloads() {
+    public boolean cancelDownload(DownloadGroupInfo downloadGroup){
         if(downloaderService != null) {
+            downloaderService.cancelDownload(downloadGroup);
+            return true;
+        }
+        return false;
+    }
+
+    public boolean startAllDownloads() {
+        if(downloaderService == null && !shouldStartAllDownloads){
+            shouldStartAllDownloads = true;
+            if(!DownloaderService.running){
+                startAndBindService();
+            }
+        } else if(downloaderService != null) {
             downloaderService.startAllDownloads();
             return true;
         }
@@ -123,18 +132,61 @@ public boolean stopAllDownloads() {
         return false;
     }
 
+    public boolean cancelAllDownloads() {
+        if(downloaderService != null) {
+            downloaderService.cancelAllDownloads();
+            return true;
+        }
+        return false;
+    }
+
     public ArrayList<DownloadGroupInfo> getDownloadsStatus() {
         if (downloaderService != null) {
             return downloaderService.getDownloadsStatus();
         }
         return null;
     }
 
+    private void startAndBindService(){
+        // start the service
+        final Intent intent = new Intent(context, DownloaderService.class);
+        context.startService(intent);
+        //we bind to the service
+        boolean result = context.bindService(new Intent(context, DownloaderService.class), this, BIND_ABOVE_CLIENT);
+        Log.d("bind download", result ? "success" : "failed");
+    }
+
+    private boolean areDownloadsRunning(boolean includePaused){
+        SharedPreferences sharedPreferences = context.getSharedPreferences("default", Context.MODE_PRIVATE);
+        String downloadsStatusString = sharedPreferences.getString("downloadsStatus", "");
+        if (!downloadsStatusString.isEmpty()) {
+            //we check if there are unfinished downloads that are not paused (or also paused ones if includePaused is true)
+            Gson gson = new Gson();
+            ArrayList<DownloadGroupInfo> downloadGroupInfos = gson.fromJson(downloadsStatusString, new TypeToken<ArrayList<DownloadGroupInfo>>() {}.getType());
+            if (downloadGroupInfos != null) {
+                for (DownloadGroupInfo groupInfo : downloadGroupInfos) {
+                    if (!groupInfo.isAllDownloadCompleted() && (includePaused || groupInfo.getRunningDownloadIndex() != -1)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
     @Override
     public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
         this.downloaderService = ((DownloaderService.LocalBinder) iBinder).getService();
         downloaderService.registerClient(serviceCallback);
         if(callback != null) callback.onServiceConnected();
+        for(DownloadGroupInfo downloadGroup: downloadsToStart) {
+            downloaderService.startDownload(downloadGroup);
+        }
+        downloadsToStart.clear();
+        if(shouldStartAllDownloads){
+            downloaderService.startAllDownloads();
+            shouldStartAllDownloads = false;
+        }
     }
 
     @Override

app/src/main/java/nie/translator/rtranslator/downloader2/Downloader2.java

@@ -13,11 +13,9 @@
 import com.downloader.OnStartOrResumeListener;
 import com.downloader.PRDownloader;
 import com.downloader.Progress;
-import com.google.common.collect.Lists;
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,7 +39,7 @@ public class Downloader2 {
 
     public Downloader2(DownloadGroupInfo downloadGroupInfo, Context context, ClientCallback callback) {
         this.downloadGroupInfo = downloadGroupInfo;
-        this.downloadGroupInfo.setRunningDownloadIndex(-1);
+        //this.downloadGroupInfo.setRunningDownloadIndex(-1);
         this.context = context;
         this.callback = callback;
     }
@@ -51,12 +49,7 @@ public void startDownloads(){
             if (downloadGroupInfo.getRunningDownloadIndex() == -1) {
                 // eventual resume of the download based on the previous ones that have been completed
                 // (or start from 0 if none of the previous ones are completed)
-                int startIndex = 0;
-                for(int i=0; i<downloadGroupInfo.downloadsInfo.length; i++){
-                    if(downloadGroupInfo.downloadsInfo[i].isAllCompleted()){
-                        startIndex++;
-                    }
-                }
+                int startIndex = findFirstIncompletedDownload();
                 DownloadInfoExtended startDownload = downloadGroupInfo.downloadsInfo[startIndex];
                 if(startIndex > 0) lastDownloadSuccessIndex = startIndex-1;
                 downloadGroupInfo.setRunningDownloadIndex(startIndex);
@@ -81,21 +74,25 @@ public void startDownloads(){
     }
 
     public void pauseDownloads(){
-        // we cancel the current download (for now this is the best option, it is difficult, if not impossible, to pause without having access to the server)
-        PRDownloader.cancel(downloadGroupInfo.downloadsInfo[downloadGroupInfo.getRunningDownloadIndex()].getDownloadId());
+        int currentDownloadIndex = downloadGroupInfo.getRunningDownloadIndex();
+        if(currentDownloadIndex != -1) {
+            // we cancel the current download (for now this is the best option, it is difficult, if not impossible, to pause without having access to the server)
+            PRDownloader.cancel(downloadGroupInfo.downloadsInfo[currentDownloadIndex].getDownloadId());
+            downloadGroupInfo.setRunningDownloadIndex(-1);
+        }
     }
 
     public void cancelDownloads(){
         int currentDownloadIndex = downloadGroupInfo.getRunningDownloadIndex();
         if(currentDownloadIndex != -1) {
             // we cancel the current download
             PRDownloader.cancel(downloadGroupInfo.downloadsInfo[currentDownloadIndex].getDownloadId());
-            // we delete the already downloaded files of this group of download
-            for (int i = 0; i <= currentDownloadIndex; i++){
-                File file = new File(downloadGroupInfo.downloadsInfo[currentDownloadIndex].getDestinationCompletePath());
-                if (file.exists()) {
-                    file.delete();
-                }
+        }
+        // we delete the already downloaded files of this group of download
+        for (int i = 0; i <= downloadGroupInfo.downloadsInfo.length; i++){
+            File file = new File(downloadGroupInfo.downloadsInfo[i].getDestinationCompletePath());
+            if (file.exists()) {
+                file.delete();
             }
         }
     }
@@ -270,6 +267,16 @@ public boolean equals(@Nullable Object obj) {
         return super.equals(obj);
     }
 
+    private int findFirstIncompletedDownload(){
+        int index = 0;
+        for(int i=0; i<downloadGroupInfo.downloadsInfo.length; i++){
+            if(downloadGroupInfo.downloadsInfo[i].isAllCompleted()){
+                index++;
+            }
+        }
+        return index;
+    }
+
     private void unpackZip(String path, String zipname, Listener listener) {
         new Thread(new Runnable() {
             @Override

app/src/main/java/nie/translator/rtranslator/downloader2/DownloaderService.java

@@ -33,7 +33,7 @@ public class DownloaderService extends Service {
     private long lastSummaryUpdateTime = 0;
     private final java.util.Map<Integer, Integer> lastChildProgresses = new java.util.HashMap<>();
     private final java.util.Map<Integer, Long> lastChildUpdateTimes = new java.util.HashMap<>();
-    private boolean started = false;
+    public static boolean running = false;
 
     public class LocalBinder extends Binder {
         DownloaderService getService() {
@@ -52,7 +52,7 @@ public void onCreate() {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         Log.i("download", "download service started");
-        if(started) {
+        if(!running) {
             // Initialize the notification system
             notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
             summaryBuilder = new NotificationCompat.Builder(this, CHANNEL_ID)
@@ -85,7 +85,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 }
             }
         }
-        started = true;
+        running = true;
 
         return super.onStartCommand(intent, flags, startId);
     }
@@ -397,6 +397,7 @@ public void notifyError(DownloadGroupInfo downloadGroup, DownloadInfo download,
     @Override
     public void onDestroy() {
         super.onDestroy();
+        running = false;
         synchronized (downloaders) {
             downloaders.clear();
         }