Merge pull request #1074 from haiwen/v3012-share-stream

v3.0.12
- New Logo
- Fix some bugs
- Improve some features

Author: zhwanng

app/build.gradle

@@ -14,8 +14,8 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         compileSdk rootProject.ext.compileSdkVersion
 
-        versionCode 170
-        versionName "3.0.11"
+        versionCode 175
+        versionName "3.0.12"
         multiDexEnabled true
 
         resValue "string", "authorities", defaultConfig.applicationId + '.debug.cameraupload.provider'
@@ -27,7 +27,7 @@ android {
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments["room.incremental"] = "true"
-                arguments["workmanager.inline"] = "false" // 禁用 WorkManager 的自动初始化
+//                arguments["workmanager.inline"] = "false"
             }
         }
     }

app/src/debug/ic_launcher-playstore.png

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.95"
+      android:scaleY="0.95"
+      android:translateX="2.7"
+      android:translateY="2.7">
+    <path
+        android:pathData="M24,51.15C24,50.13 24.82,49.32 25.82,49.32C26.3,49.32 26.73,49.51 27.06,49.81C27.05,49.65 27.04,49.49 27.04,49.33C27.04,45.93 29.76,43.19 33.13,43.19C34,43.19 34.82,43.37 35.58,43.71C35.57,43.54 35.56,43.36 35.56,43.2C35.56,38.12 39.64,34 44.69,34C49.69,34 53.76,38.07 53.81,43.11C52.16,44.57 50.85,46.42 50,48.5C48.37,47.48 46.45,46.87 44.39,46.87C40.14,46.87 36.48,49.3 34.76,52.98H28.26H25.82C24.82,52.96 24,52.16 24,51.15ZM71.69,45.64C69.44,43.37 66.35,41.97 62.92,41.97C56.67,41.97 51.49,46.64 50.64,52.71C49.1,50.64 46.64,49.29 43.87,49.29C39.19,49.29 35.4,53.12 35.4,57.83C35.4,59.21 35.72,60.5 36.29,61.65C33.35,62.25 31.17,64.56 31.17,67.29C31.17,70.5 34.15,73.09 37.83,73.09C39.45,73.09 40.94,72.58 42.09,71.73L55.7,58.23C57.21,56.84 59.21,56 61.41,56C66.01,56 69.76,59.7 69.88,64.31C69.88,64.31 69.88,64.3 69.87,64.3C69.95,65.67 69.24,67.04 67.94,67.8C66.13,68.85 63.86,68.29 62.87,66.55C61.87,64.8 62.52,62.54 64.34,61.48C64.76,61.24 65.2,61.08 65.65,61C65.27,60.92 64.86,60.88 64.45,60.88C61.11,60.88 58.39,63.61 58.39,66.99C58.39,70.36 61.1,73.09 64.45,73.09C64.59,73.09 64.74,73.08 64.89,73.07L64.88,73.05L65.05,73.04H76.93V73.08C80.56,72.92 84,69.54 84,65.43C84,61.22 80.43,57.78 76.25,57.78C76.24,57.78 76.24,57.78 76.23,57.78C75.56,59 74.74,59.71 73.81,60.47C74.78,58.68 75.34,56.64 75.34,54.46C75.32,51.01 73.93,47.9 71.69,45.64Z"
+        android:fillColor="#08A800"/>
+  </group>
+</vector>

app/src/debug/res/drawable-hdpi/ic_launcher.png

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/debug/res/drawable-ldpi/ic_launcher.png

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/debug/res/drawable-mdpi/ic_launcher.png

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

app/src/debug/res/drawable-xhdpi/ic_launcher.png

@@ -61,10 +61,11 @@
     <application
         android:name=".SeadroidApplication"
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:requestLegacyExternalStorage="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme.Material3">
 
         <!--        <provider-->

app/src/debug/res/drawable-xxhdpi/ic_launcher.png

@@ -43,6 +43,7 @@ public class SeafException extends Exception {
     public static final SeafException REQUEST_TRANSFER_URL_EXCEPTION = new SeafException(24, "request transfer url failed");
     public static final SeafException IO_EXCEPTION = new SeafException(25, "io exception");
     public static final SeafException PERMISSION_EXCEPTION = new SeafException(26, "miss permission");
+    public static final SeafException NETWORK_UNAVAILABLE = new SeafException(27, SeadroidApplication.getAppContext().getString(R.string.network_unavailable));
 
     public SeafException(int code, String msg) {
         super(msg);

app/src/debug/res/drawable-xxxhdpi/ic_launcher.png

@@ -6,9 +6,6 @@ public class AbsLayoutItemType {
      */
     public static final int NOT_SUPPORTED = -1;
 
-    //
-    public static final int BLANK = -2;
-
     public static final int REPO = 10;
     public static final int DIRENT_LIST = 11;
     public static final int DIRENT_GRID = 12;

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -10,7 +10,6 @@ private Constants() {
 
 
     public static final int PERIODIC_SCAN_INTERVALS = 1000 * 60 * 5; //5m
-    public static final int PASSWORD_MINIMUM_LENGTH = 8;
     public static final String URL_PRIVACY = "https://www.seafile.com/privacy/";
 
     public static class ObjType {

app/src/debug/res/drawable/logo_debug_large.xml

@@ -218,7 +218,7 @@ private void startFolderMonitor(List<String> pathList) {
             List<FileAlterationObserver> observerList = new ArrayList<>();
             for (String str : pathList) {
 
-                SLogs.d("backup path: " + str);
+                SLogs.d(FileSyncService.class, "backup path: " + str);
                 FileAlterationObserver observer = new FileAlterationObserver(str, FILE_FILTER);
 
                 observer.addListener(new FileSyncService.FolderStateChangedListener());
@@ -282,48 +282,48 @@ public FolderStateChangedListener() {
 
         @Override
         public void onStart(FileAlterationObserver observer) {
-            SLogs.d("FileMonitor onStart: " + observer.getDirectory());
+            SLogs.d(FileSyncService.class, "monitor start: " + observer.getDirectory());
         }
 
         @Override
         public void onDirectoryCreate(File directory) {
-            SLogs.d("FileMonitor onDirectoryCreate = " + directory.getAbsolutePath());
+            SLogs.d(FileSyncService.class, "onDirectoryCreate = " + directory.getAbsolutePath());
 //            doBackup("create", directory);
         }
 
         @Override
         public void onDirectoryChange(File directory) {
-            SLogs.d("FileMonitor onDirectoryChange = " + directory.getAbsolutePath());
+            SLogs.d(FileSyncService.class, "onDirectoryChange = " + directory.getAbsolutePath());
 //            doBackup("change", directory);
         }
 
         @Override
         public void onDirectoryDelete(File directory) {
-            SLogs.d("FileMonitor onDirectoryDelete = " + directory.getAbsolutePath());
+            SLogs.d(FileSyncService.class, "onDirectoryDelete = " + directory.getAbsolutePath());
 //            doBackup("delete", directory);
         }
 
         @Override
         public void onFileCreate(File file) {
-            SLogs.d("FileMonitor onFileCreate = " + file.getAbsolutePath());
+            SLogs.d(FileSyncService.class, "onFileCreate = " + file.getAbsolutePath());
             doBackup("create", file);
         }
 
         @Override
         public void onFileChange(File file) {
-            SLogs.d("FileMonitor onFileChange = " + file.getAbsolutePath());
+            SLogs.d(FileSyncService.class, "onFileChange = " + file.getAbsolutePath());
             doBackup("change", file);
         }
 
         @Override
         public void onFileDelete(File file) {
-            SLogs.d("FileMonitor onFileDelete = " + file.getAbsolutePath());
+            SLogs.d(FileSyncService.class, "onFileDelete = " + file.getAbsolutePath());
 //            doBackup("delete", file);
         }
 
         @Override
         public void onStop(FileAlterationObserver observer) {
-            SLogs.d("FileMonitor onStop");
+            SLogs.d(FileSyncService.class, "monitor stop");
         }
     }
 
@@ -335,7 +335,7 @@ public void onDestroy() {
     }
 
     private void destroy() {
-        SLogs.e("file monitor service destroy");
+        SLogs.d(FileSyncService.class, "file monitor service destroy");
         stopFolderMonitor();
 
         //

app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,6 +2,7 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 
 public class SDocPageOptionsModel implements Parcelable {
     public String docName;
@@ -15,6 +16,17 @@ public class SDocPageOptionsModel implements Parcelable {
 
     public boolean enableMetadataManagement;
 
+    public boolean canUse() {
+        if (TextUtils.isEmpty(seadocServerUrl)
+                || TextUtils.isEmpty(docUuid)
+                || TextUtils.isEmpty(repoID)
+                || TextUtils.isEmpty(seadocAccessToken)) {
+            return false;
+        }
+
+        return true;
+    }
+
     @Override
     public String toString() {
         return "SDocPageOptionsModel{" +

app/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -92,6 +92,11 @@ public static SeafException parse(int errorCode, String bodyString) {
             if (bodyString.toLowerCase().contains("please provide password to view it")) {
                 return SeafException.INVALID_PASSWORD;
             }
+
+            if (bodyString.toLowerCase().contains("wrong password")) {
+                return SeafException.INVALID_PASSWORD;
+            }
+
             return SeafException.NOT_FOUND_LOGGED_USER_EXCEPTION;
         }
 

app/src/debug/res/mipmap-hdpi/ic_launcher.png

@@ -113,6 +113,10 @@ public static void d(String msg) {
         XLog.d(msg);
     }
 
+    public static void d(Class<?> clz, String msg) {
+        XLog.d(clz.getSimpleName() + " -> " + msg);
+    }
+
     public static void d(String msg, Throwable tr) {
         XLog.d(msg, tr);
     }

app/src/debug/res/mipmap-hdpi/ic_launcher.webp

@@ -175,7 +175,7 @@ public static List<BaseModel> convertToAdapterList(List<RepoModel> list, boolean
         List<RepoModel> mineList = treeMap.get(RepoType.TYPE_MINE);
         if (!CollectionUtils.isEmpty(mineList)) {
             List<RepoModel> sortedList = sortRepos(mineList);
-            newRvList.add(new GroupItemModel(R.string.personal, sortedList));
+            newRvList.add(new GroupItemModel(R.string.my_libraries, sortedList));
             newRvList.addAll(sortedList);
         }
 

app/src/debug/res/mipmap-hdpi/ic_launcher_round.webp

@@ -20,10 +20,10 @@
 import com.seafile.seadroid2.framework.worker.download.DownloadFileScannerWorker;
 import com.seafile.seadroid2.framework.worker.download.DownloadWorker;
 import com.seafile.seadroid2.framework.worker.reupoad.DownloadedFileMonitorWorker;
-import com.seafile.seadroid2.framework.worker.upload.FolderBackupScanWorker;
-import com.seafile.seadroid2.framework.worker.upload.MediaBackupScanWorker;
 import com.seafile.seadroid2.framework.worker.upload.FileUploadWorker;
+import com.seafile.seadroid2.framework.worker.upload.FolderBackupScanWorker;
 import com.seafile.seadroid2.framework.worker.upload.FolderBackupUploadWorker;
+import com.seafile.seadroid2.framework.worker.upload.MediaBackupScanWorker;
 import com.seafile.seadroid2.framework.worker.upload.MediaBackupUploadWorker;
 
 import java.util.List;
@@ -55,6 +55,8 @@ private static class SingletonHolder {
     }
 
     private <T extends ListenableWorker> OneTimeWorkRequest.Builder oneTimeRequestBuilder(Class<T> tClass) {
+        SLogs.d(BackgroundJobManagerImpl.class, "Creating WorkRequest for: " + tClass.getSimpleName());
+
         return new OneTimeWorkRequest.Builder(tClass)
                 .setBackoffCriteria(BackoffPolicy.LINEAR, 5, TimeUnit.SECONDS)
                 .addTag(TAG_ALL)
@@ -72,7 +74,7 @@ private <T extends ListenableWorker> PeriodicWorkRequest.Builder periodicRequest
         return new PeriodicWorkRequest.Builder(tClass, intervalMins, TimeUnit.MINUTES, flexIntervalMins, TimeUnit.MINUTES)
                 .addTag(TAG_ALL)
                 .addTag(TAG_TRANSFER)
-                .addTag(tClass.getSimpleName());
+                .addTag(TAG_TRANSFER + ":" + tClass.getSimpleName());
     }
 
     public void cancelById(UUID uid) {
@@ -94,6 +96,7 @@ public WorkManager getWorkManager() {
     ////////////////////// media //////////////////////
 
     public void startMediaBackupChain(boolean isForce) {
+        SLogs.d(BackgroundJobManagerImpl.class, "startMediaBackupChain: isForce:" + isForce);
         cancelMediaBackupChain();
 
         OneTimeWorkRequest scanRequest = getMediaScannerWorkerRequest(isForce);
@@ -145,12 +148,6 @@ private OneTimeWorkRequest getMediaUploadWorkerRequest() {
                 .build();
     }
 
-    public void restartMediaBackupWorker() {
-        SLogs.e("restartMediaBackupWorker");
-        cancelByTag(TAG_ALBUM_BACKUP);
-        startMediaBackupChain(false);
-    }
-
     //cancel media
     public void cancelMediaBackupChain() {
         cancelByTag(TAG_ALBUM_BACKUP);
@@ -159,6 +156,7 @@ public void cancelMediaBackupChain() {
     ////////////////////// upload folder //////////////////////
 
     public void startFolderBackupChain(boolean isForce) {
+        SLogs.d(BackgroundJobManagerImpl.class, "startFolderBackupChain: isForce:" + isForce);
         cancelFolderBackupWorker();
 
         OneTimeWorkRequest scanRequest = getFolderBackupScanWorkerRequest(isForce);
@@ -209,18 +207,14 @@ private OneTimeWorkRequest getFolderBackupUploadWorkerRequest() {
                 .build();
     }
 
-    public void restartFolderBackupWorker() {
-        cancelByTag(TAG_FOLDER_BACKUP);
-
-        startFolderBackupChain(false);
-    }
-
     public void cancelFolderBackupWorker() {
+        SLogs.d(BackgroundJobManagerImpl.class, "cancelFolderBackupWorker");
         cancelByTag(TAG_FOLDER_BACKUP);
     }
 
     ////////////////////// upload file //////////////////////
     public void startFileUploadWorker() {
+        SLogs.d(BackgroundJobManagerImpl.class, "startFileUploadWorker");
         String workerName = FileUploadWorker.class.getSimpleName();
         OneTimeWorkRequest request = getFileUploadRequest();
         getWorkManager().enqueueUniqueWork(workerName, ExistingWorkPolicy.KEEP, request);
@@ -251,6 +245,7 @@ public void startDownloadChain() {
     }
 
     public void startDownloadChain(List<String> direntIds) {
+        SLogs.d(BackgroundJobManagerImpl.class, "start download chain");
         OneTimeWorkRequest scanRequest = getDownloadScanRequest(direntIds);
         OneTimeWorkRequest downloadRequest = getDownloadRequest();
 
@@ -304,7 +299,9 @@ public void cancelDownloadWorker() {
     ////////////////////// downloaded file monitor //////////////////////
 
     public void startCheckDownloadedFileChain() {
+        SLogs.d(BackgroundJobManagerImpl.class, "startCheckDownloadedFileChain");
         OneTimeWorkRequest checkRequest = getCheckDownloadedFileRequest();
+
         String workerName = DownloadedFileMonitorWorker.class.getSimpleName();
         getWorkManager().enqueueUniqueWork(workerName, ExistingWorkPolicy.KEEP, checkRequest);
     }
@@ -315,13 +312,12 @@ private OneTimeWorkRequest getCheckDownloadedFileRequest() {
                 .build();
         return oneTimeRequestBuilder(DownloadedFileMonitorWorker.class)
                 .setConstraints(constraints)
+                .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
                 .build();
     }
 
 
     public void cancelAllJobs() {
         getWorkManager().cancelAllWork();
     }
-
-
 }