SMBSync3 Fixes

README.MD

@@ -15,15 +15,15 @@ Improved version of [SMBSync2](https://github.com/Sentaroh/SMBSync2)
 
 ### License information
 - This software includes the work that is distributed in the Apache License 2.0.
-  - [Zip4J 2.2.3](https://github.com/srikanth-lingala/zip4j)
+  - [Zip4J 2.11.1](https://github.com/srikanth-lingala/zip4j)
   - [Metadata-extractor](https://github.com/drewnoakes/metadata-extractor)
 - This software includes the work that is distributed in the GNU Lesser General Public License v2.1.  
-  - [jcifs-ng](https://github.com/AgNO3/jcifs-ng)
-  - [jcifs-1.3.17](https://jcifs.samba.org/)
+  - [jcifsng-2.1.17](https://github.com/AgNO3/jcifs-ng)
+  - [jcifs-1.3.19](https://jcifs.samba.org/)
 - This software includes the work that is distributed in the MOZILLA PUBLIC LICENSE 1.1.  
   - [juniversalchardet-1.0.3](https://code.google.com/archive/p/juniversalchardet/)  
 - This software includes the work that is distributed in the Bouncy Castle LICENSE.
-  - [Bouncy Castle Provider](https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on/1.66)
+  - [Bouncy Castle Provider](https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on/1.69)
 - This software includes the work that is distributed in the BSD 3-Clause "New" or "Revised" License
   - [markdownj](https://github.com/myabc/markdownj)
 - This software includes the work that is distributed in the MIT LICENSE.

app/build.gradle

@@ -1,20 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.3"//"29.0.3"
+    compileSdk 33
+    buildToolsVersion '33.0.0' //"29.0.3"
     defaultConfig {
         applicationId "com.sentaroh.android.SMBSync3"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 2
         versionName "1.0.1"
     }
 
-    lintOptions {
-        disable 'MissingTranslation'
-        abortOnError false
-    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -42,7 +38,8 @@ android {
                         }
 
                         task copyDebugApkRelease(type: Copy) {
-                            from 'build/outputs/apk/debug'
+//                            from 'build/outputs/apk/debug'
+                            from 'build/intermediates/apk/debug'
                             into '../release/' // Into the project root, one level above the app folder
                             include '*debug.apk'
                         }
@@ -51,10 +48,10 @@ android {
 //                            options.compilerArgs << '-Xlint:unchecked,deprecation'
 //                        }
 
-                        afterEvaluate {
+//                        afterEvaluate {
                             packageDebug.finalizedBy(copyDebugApkRelease)
 //                            copyDebugApkRelease.finalizedBy(copyDebugApk)
-                        }
+//                        }
 
                     }
                 }
@@ -81,27 +78,46 @@ android {
 
         }
     }
+    lint {
+        abortOnError false
+        disable 'MissingTranslation'
+    }
+    namespace 'com.sentaroh.android.SMBSync3'
 
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+//    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1' //bug with duplicate lifecycle-viewmodel-2.5.0-runtime as it needs both java and ktx implementations
+//    implementation 'androidx.appcompat:appcompat:1.6.0-rc01' //compileSdkVersion 33
+
+    // Both lifecycle-viewmodel java/ktx implementations are needed for appcompat 1.5.1
+    // The implementations can be removed in appcompat 1.6.0
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' 
+
 
 //    implementation 'com.google.android.material:material:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.6.1'
 //    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
-
-    implementation files('libs/jcifs-ng-2.1.6-20201207-01.jar')
-    implementation files('libs/jcifs-1.3.17_patch.jar')
-    implementation files('libs/JcifsFile2-1.0.8.jar')
-    implementation files('libs/bcprov-jdk15to18-1.66.jar')
+//    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
+
+    implementation files('libs/jcifsng-latest.jar')
+    implementation files('libs/jcifs13-1.3.19.jar')
+    implementation files('libs/JcifsFile2-1.0.9.jar')
+//    implementation files('libs/bcprov-jdk15to18-1.66.jar')
+//    implementation files('libs/bcprov-jdk15to18-169.jar')
+    implementation 'org.bouncycastle:bcprov-jdk15to18:1.69'
+//    implementation 'org.bouncycastle:bcprov-jdk15to18:1.71'
 
     implementation files('libs/Utilities3-1.0.3.aar')
 
     implementation files('libs/metadata-extractor-2.11.0.jar')
 
-    implementation "androidx.work:work-runtime:2.5.0"
+//    implementation "androidx.work:work-runtime:2.5.0"
+    implementation "androidx.work:work-runtime:2.7.1"
 
     implementation files('libs/MarkDownJ_0.4.jar')
 
@@ -112,5 +128,10 @@ dependencies {
 //    implementation 'androidx.activity:activity:1.2.0-rc01'
 //    implementation "androidx.fragment:fragment-ktx:1.3.0-rc01"
 //    implementation "androidx.core:core-ktx:+"
+//    implementation "androidx.activity:activity:1.3.1"
+//    implementation "androidx.activity:activity-ktx:1.3.1"
+//    implementation "androidx.fragment:fragment:1.5.2"
+
+    implementation 'androidx.preference:preference:1.2.0'
 
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.sentaroh.android.SMBSync3">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -59,12 +58,12 @@
         </receiver>
 
         <activity
-            android:label="@string/app_name"
             android:name=".ActivityMain"
             android:launchMode="standard"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|layoutDirection|fontScale"
             android:screenOrientation="unspecified"
-            android:alwaysRetainTaskState="true">
+            android:alwaysRetainTaskState="true"
+            android:exported="true">
 
             <intent-filter >
                 <action android:name="android.intent.action.MAIN" />
@@ -79,28 +78,31 @@
 
         <activity
             android:name=".ActivitySettings"
-            android:label="@string/app_name"
             android:screenOrientation="unspecified"
             android:icon="@drawable/smbsync">
+
+            <!-- Return to main app when pressing Top action bar back button -->
+            <meta-data
+                    android:name="android.support.PARENT_ACTIVITY"
+                    android:value=".ActivityMain"/>
         </activity>
 
         <activity
             android:name=".ActivityPasswordSettings"
-            android:label="@string/app_name"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|layoutDirection|fontScale"
             android:screenOrientation="unspecified"
             android:icon="@drawable/smbsync"
             android:excludeFromRecents="true">
         </activity>
 
         <activity
-            android:label="@string/app_name"
             android:name=".ActivityIntentHandler"
             android:theme="@android:style/Theme.Translucent"
             android:launchMode="singleTop"
             android:taskAffinity=".ActivityIntentHandler"
             android:screenOrientation="unspecified"
-            android:excludeFromRecents="true">
+            android:excludeFromRecents="true"
+            android:exported="true">
 
             <intent-filter >
                 <action android:name="${applicationId}.ACTION_START_SYNC"/>

app/src/main/java/com/sentaroh/android/SMBSync3/ActivityIntentHandler.java

@@ -51,7 +51,7 @@ public class ActivityIntentHandler extends Activity {
 
     @Override
     protected void attachBaseContext(Context base) {
-        super.attachBaseContext(GlobalParameters.setNewLocale(base));
+        super.attachBaseContext(GlobalParameters.setLocaleAndMetrics(base));
     }
 
     @Override
@@ -64,15 +64,14 @@ protected void onCreate(Bundle savedInstanceState) {
         if (mGp == null) {
             mGp =GlobalWorkArea.getGlobalParameter(c);
         }
-        if (mUtil == null) mUtil = mUtil = new CommonUtilities(c, "IntentHandler", mGp, null);
+        if (mUtil == null) mUtil = new CommonUtilities(c, "IntentHandler", mGp, null);
 
         mGp.loadConfigList(c, mUtil);
 
         final Intent received_intent=getIntent();
         if (received_intent.getAction()!=null && !received_intent.getAction().equals("")) {
             if (received_intent.getAction().equals(QUERY_SYNC_TASK_INTENT)) {
                 querySyncTask(c, received_intent);
-                finish();
             } else {
                 String action=received_intent.getAction();
                 String task_list=received_intent.getStringExtra(START_SYNC_EXTRA_PARM_SYNC_TASK);
@@ -81,8 +80,8 @@ protected void onCreate(Bundle savedInstanceState) {
                 } else {
                     SyncWorker.startSyncWorkerByAction(c, mGp, mUtil, action, "", task_list);
                 }
-                finish();
             }
+            finish();
         }
     }
 
@@ -98,7 +97,8 @@ public void onDestroy() {
     }
 
     private void querySyncTask(Context c, Intent in) {
-        String reply_list = "", sep = "";
+        StringBuilder reply_list = new StringBuilder();
+        String sep = "";
         String task_type = QUERY_SYNC_TASK_EXTRA_PARM_TASK_TYPE_AUTO;
         if (in.getStringExtra(QUERY_SYNC_TASK_EXTRA_PARM_TASK_TYPE) != null)
             task_type = in.getStringExtra(QUERY_SYNC_TASK_EXTRA_PARM_TASK_TYPE);
@@ -109,32 +109,32 @@ private void querySyncTask(Context c, Intent in) {
                 SyncTaskItem sti = mGp.syncTaskList.get(i);
                 if (task_type.toLowerCase().equals(QUERY_SYNC_TASK_EXTRA_PARM_TASK_TYPE_TEST.toLowerCase())) {
                     if (sti.isSyncTestMode()) {
-                        reply_list += sep + sti.getSyncTaskName();
+                        reply_list.append(sep).append(sti.getSyncTaskName());
                         sep = NAME_LIST_SEPARATOR;
                         reply_count++;
                     }
                 } else if (task_type.toLowerCase().equals(QUERY_SYNC_TASK_EXTRA_PARM_TASK_TYPE_AUTO.toLowerCase())) {
                     if (sti.isSyncTaskAuto()) {
-                        reply_list += sep + sti.getSyncTaskName();
+                        reply_list.append(sep).append(sti.getSyncTaskName());
                         sep = NAME_LIST_SEPARATOR;
                         reply_count++;
                     }
                 } else if (task_type.toLowerCase().equals(QUERY_SYNC_TASK_EXTRA_PARM_TASK_TYPE_MANUAL.toLowerCase())) {
                     if (!sti.isSyncTaskAuto()) {
-                        reply_list += sep + sti.getSyncTaskName();
+                        reply_list.append(sep).append(sti.getSyncTaskName());
                         sep = NAME_LIST_SEPARATOR;
                         reply_count++;
                     }
                 } else if (task_type.toLowerCase().equals(QUERY_SYNC_TASK_EXTRA_PARM_TASK_TYPE_ALL.toLowerCase())) {
-                    reply_list += sep + sti.getSyncTaskName();
+                    reply_list.append(sep).append(sti.getSyncTaskName());
                     sep = NAME_LIST_SEPARATOR;
                     reply_count++;
                 }
             }
         }
         Intent reply = new Intent(REPLY_SYNC_TASK_INTENT);
         reply.putExtra(REPLY_SYNC_TASK_EXTRA_PARM_SYNC_COUNT, reply_count);
-        reply.putExtra(REPLY_SYNC_TASK_EXTRA_PARM_SYNC_ARRAY, reply_list);
+        reply.putExtra(REPLY_SYNC_TASK_EXTRA_PARM_SYNC_ARRAY, reply_list.toString());
         mUtil.addDebugMsg(1, "I", "query result, count="+reply_count+", list=["+reply_list+"]");
         c.sendBroadcast(reply);
     }