Reverted appScan module removal, applicationId changes.

surinder-tsys · surinder-tsys · commit dee6d6cd065a · 2023-03-29T20:45:00.000+05:30
Removed SplashActivity from this feature.
diff --git a/app/build.gradle b/app/build.gradle
@@ -128,29 +128,29 @@ android {
         productFlavors {
             // used for f-droid
             generic {
-                applicationId 'com.t_systems.android.webdav'
+                applicationId 'com.nextcloud.client'
                 dimension "default"
             }
 
             gplay {
-                applicationId 'com.t_systems.android.webdav'
+                applicationId 'com.nextcloud.client'
                 dimension "default"
             }
 
             huawei {
-                applicationId 'com.t_systems.android.webdav'
+                applicationId 'com.nextcloud.client'
                 dimension "default"
             }
 
             versionDev {
-                applicationId "com.t_systems.android.webdav.beta"
+                applicationId "com.nextcloud.android.beta"
                 dimension "default"
                 versionCode 20220322
                 versionName "20220322"
             }
 
             qa {
-                applicationId "com.t_systems.android.webdav.beta"
+                applicationId "com.nextcloud.android.qa"
                 dimension "default"
                 versionCode 1
                 versionName "1"
@@ -275,10 +275,11 @@ dependencies {
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion"
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:$fidoVersion"
 
+    //NextCloud scan is not required in NMC
     // document scanner not available on FDroid (generic) due to OpenCV binaries
-    gplayImplementation project(':appscan')
-    huaweiImplementation project(':appscan')
-    qaImplementation project(':appscan')
+    /* gplayImplementation project(':appscan')
+       huaweiImplementation project(':appscan')
+       qaImplementation project(':appscan') */
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.12.0'
     spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'
diff --git a/app/src/generic/google-services.json b/app/src/generic/google-services.json
@@ -8,7 +8,7 @@
       "client_info": {
         "mobilesdk_app_id": "",
         "android_client_info": {
-          "package_name": "com.t_systems.android.webdav"
+          "package_name": "com.nextcloud.client"
         }
       },
       "oauth_client": [],
diff --git a/app/src/gplay/google-services.json b/app/src/gplay/google-services.json
@@ -8,7 +8,7 @@
       "client_info": {
         "mobilesdk_app_id": "",
         "android_client_info": {
-          "package_name": "com.t_systems.android.webdav"
+          "package_name": "com.nextcloud.client"
         }
       },
       "oauth_client": [],
diff --git a/app/src/gplay/java/com/nextcloud/client/di/VariantModule.kt b/app/src/gplay/java/com/nextcloud/client/di/VariantModule.kt
@@ -21,7 +21,6 @@
  */
 package com.nextcloud.client.di
 
-import com.nextcloud.appscan.ScanPageContract
 import com.nextcloud.client.documentscan.AppScanOptionalFeature
 import dagger.Module
 import dagger.Provides
@@ -32,8 +31,6 @@ internal class VariantModule {
     @Provides
     @Reusable
     fun scanOptionalFeature(): AppScanOptionalFeature {
-        return object : AppScanOptionalFeature() {
-            override fun getScanContract() = ScanPageContract()
-        }
+        return AppScanOptionalFeature.Stub
     }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -101,9 +101,13 @@
             android:name=".ui.activity.FileDisplayActivity"
             android:configChanges="orientation|screenSize"
             android:exported="true"
-            android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/Theme.ownCloud.Toolbar.Drawer">
+            android:theme="@style/Theme.ownCloud.Launcher">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
@@ -221,17 +225,6 @@
             android:exported="false"
             android:theme="@style/Theme.ownCloud.Overlay" />
 
-        <activity
-            android:name="com.nmc.android.ui.SplashActivity"
-            android:exported="true"
-            android:theme="@style/Theme.ownCloud.Splash" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
         <activity
             android:name="com.nmc.android.ui.ScanActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
@@ -507,7 +500,6 @@
             android:name="com.nextcloud.client.documentscan.DocumentScanActivity"
             android:exported="false"
             android:theme="@style/Theme.ownCloud.Toolbar" />
-
     </application>
 
     <queries>
diff --git a/app/src/main/java/com/nmc/android/jobs/ScanDocUploadWorker.kt b/app/src/main/java/com/nmc/android/jobs/ScanDocUploadWorker.kt
@@ -56,6 +56,7 @@ class ScanDocUploadWorker constructor(
         const val DATA_SCAN_FILE_TYPES = "data_scan_file_types"
         const val DATA_SCAN_PDF_PWD = "data_scan_pdf_pwd"
         const val DATA_DOC_FILE_NAME = "data_doc_file_name"
+        const val IMAGE_COMPRESSION_PERCENTAGE = 85
     }
 
     override fun doWork(): Result {
@@ -113,7 +114,7 @@ class ScanDocUploadWorker constructor(
     private fun initScanBotSDK() {
         scanbotSDK = ScanbotSDK(context)
         pdfRenderer = scanbotSDK.createPdfRenderer()
-        pageFileStorage = scanbotSDK.pageFileStorage
+        pageFileStorage = scanbotSDK.createPageFileStorage()
         opticalCharacterRecognizer = scanbotSDK.createOcrRecognizer()
     }
 
@@ -125,7 +126,7 @@ class ScanDocUploadWorker constructor(
                 newFileName += "($i)"
             }
 
-            val jpgFile = FileUtils.saveJpgImage(context, bitmap, newFileName)
+            val jpgFile = FileUtils.saveJpgImage(context, bitmap, newFileName, IMAGE_COMPRESSION_PERCENTAGE)
             savedFiles.add(jpgFile.path)
         }
     }
@@ -138,7 +139,7 @@ class ScanDocUploadWorker constructor(
                 newFileName += "($i)"
             }
 
-            val pngFile = FileUtils.savePngImage(context, bitmap, newFileName)
+            val pngFile = FileUtils.savePngImage(context, bitmap, newFileName, IMAGE_COMPRESSION_PERCENTAGE)
             savedFiles.add(pngFile.path)
         }
     }
diff --git a/app/src/main/java/com/nmc/android/ui/SplashActivity.kt b/app/src/main/java/com/nmc/android/ui/SplashActivity.kt
diff --git a/app/src/main/java/com/nmc/android/utils/FileUtils.java b/app/src/main/java/com/nmc/android/utils/FileUtils.java
@@ -11,6 +11,7 @@
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.helpers.FileOperationsHelper;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -19,8 +20,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.Locale;
 
 public class FileUtils {
@@ -29,23 +32,38 @@ public class FileUtils {
     private static final String SCANNED_FILE_PREFIX = "scan_";
     private static final int JPG_FILE_TYPE = 1;
     private static final int PNG_FILE_TYPE = 2;
-    private static final String SCANNED_DIRECTORY_NAME = "Scans";
 
-    public static File saveJpgImage(Context context, Bitmap bitmap, String imageName) {
-        return saveImage(context, bitmap, imageName, JPG_FILE_TYPE);
+    public static File saveJpgImage(Context context, Bitmap bitmap, String imageName, int quality) {
+        return createFileAndSaveImage(context, bitmap, imageName, quality, JPG_FILE_TYPE);
     }
 
-    public static File savePngImage(Context context, Bitmap bitmap, String imageName) {
-        return saveImage(context, bitmap, imageName, PNG_FILE_TYPE);
+    public static File savePngImage(Context context, Bitmap bitmap, String imageName, int quality) {
+        return createFileAndSaveImage(context, bitmap, imageName, quality, PNG_FILE_TYPE);
     }
 
-    private static File saveImage(Context context, Bitmap bitmap, String imageName, int fileType) {
+    public static File saveJpgImage(Context context, Bitmap bitmap, File file, int quality) {
+        return saveImage(file, bitmap, quality, JPG_FILE_TYPE);
+    }
+
+    public static File savePngImage(Context context, Bitmap bitmap, File file, int quality) {
+        return saveImage(file, bitmap, quality, PNG_FILE_TYPE);
+    }
+
+    private static File createFileAndSaveImage(Context context, Bitmap bitmap, String imageName, int quality,
+                                               int fileType) {
+        File file = fileType == PNG_FILE_TYPE ? getPngImageName(context, imageName) : getJpgImageName(context,
+                                                                                                      imageName);
+        return saveImage(file, bitmap, quality, fileType);
+    }
+
+    private static File saveImage(File file, Bitmap bitmap, int quality, int fileType) {
         try {
-            File file = fileType == PNG_FILE_TYPE ? getPngImageName(context, imageName) : getJpgImageName(context,
-                                                                                                          imageName);
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            bitmap.compress(Bitmap.CompressFormat.JPEG, quality, bos);
+            byte[] bitmapData = bos.toByteArray();
+
             FileOutputStream fileOutputStream = new FileOutputStream(file);
-            bitmap.compress(fileType == PNG_FILE_TYPE ? Bitmap.CompressFormat.PNG : Bitmap.CompressFormat.JPEG, 100,
-                            fileOutputStream);
+            fileOutputStream.write(bitmapData);
             fileOutputStream.flush();
             fileOutputStream.close();
             return file;
@@ -96,7 +114,7 @@ public static String scannedFileName() {
     }
 
     public static File getOutputMediaFile(Context context) {
-        File file = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), SCANNED_DIRECTORY_NAME);
+        File file = new File(context.getExternalFilesDir(Environment.DIRECTORY_PICTURES), "");
         if (!file.exists()) {
             file.mkdir();
         }
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
@@ -5,20 +5,18 @@
     <bool name="dev_version_direct_download_enabled">false</bool>
 
     <!-- App name  and other strings-->
-    <string name="app_name">MagentaCLOUD</string>
-    <string name="project_name">Magenta</string>
-    <string name="account_type">com.t_systems.android.webdav</string>     <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
-    <string name="authority">com.t_systems.android.webdav.provider</string>    <!-- better if was the app package with "
-    .provider" appended ; it identifies the provider -->
-    <string name="users_and_groups_search_authority">com.t_systems.android.webdav.android.providers.UsersAndGroupsSearchProvider</string>
-    <string name="users_and_groups_share_with">com.t_systems.android.webdav.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
-    <string name="document_provider_authority">com.t_systems.android.webdav.documents</string>
-    <string name="file_provider_authority">com.t_systems.android.webdav.files</string>
-    <string name="image_cache_provider_authority">com.t_systems.android.webdav.imageCache.provider</string>
+    <string name="app_name">Nextcloud</string>
+    <string name="account_type">nextcloud</string>     <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
+    <string name="authority">org.nextcloud</string>    <!-- better if was the app package with ".provider" appended ; it identifies the provider -->
+    <string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
+    <string name="users_and_groups_share_with">com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH</string>
+    <string name="document_provider_authority">org.nextcloud.documents</string>
+    <string name="file_provider_authority">org.nextcloud.files</string>
+    <string name="image_cache_provider_authority">org.nextcloud.imageCache.provider</string>
     <string name="db_file">nextcloud.db</string>
     <string name="db_name">nextcloud</string>
-    <string name="data_folder">com.t_systems.android.webdav</string>
-    <string name="default_display_name_for_root_folder">MagentaCLOUD</string>
+    <string name="data_folder">nextcloud</string>
+    <string name="default_display_name_for_root_folder">Nextcloud</string>
     <string name="nextcloud_user_agent">Mozilla/5.0 (Android) Nextcloud-android/%1$s</string>
     <string name="only_office_user_agent">Mozilla/5.0 (Android %1$s) Mobile Nextcloud-android/%2$s</string>
 
@@ -45,7 +43,7 @@
     <array name="whatsnew_urls"></array>
 
     <!-- Colors -->
-    <color name="primary">#E20074</color>
+    <color name="primary">#0082c9</color>
     <color name="primary_dark">#006AA3</color>
     <color name="color_accent">#007cc2</color>
     <color name="login_text_color">#ffffff</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -152,8 +152,8 @@
 
     <style name="Theme.ownCloud.noActionBar.Login" parent="Theme.ownCloud.noActionBar.LoginBase" />
 
-    <style name="ownCloud.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
-        <item name="colorAccent">@color/primary</item>
+    <style name="ownCloud.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
+        <item name="colorAccent">@color/color_accent</item>
         <item name="searchViewStyle">@style/ownCloud.SearchView</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:windowBackground">@color/bg_default</item>
@@ -228,6 +228,7 @@
         <item name="android:textStyle">bold</item>
     </style>
 
+    <!-- styling required for NMC buttons -->
     <style name="Button.Borderless.Normal" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:textColor">@drawable/borderless_btn</item>
         <item name="android:textAllCaps">false</item>
@@ -293,19 +294,6 @@
         <item name="android:textColorHint">@color/secondary_text_color</item>
     </style>
 
-    <style name="Theme.ownCloud.Fullscreen" parent="@style/Theme.MaterialComponents.DayNight">
-        <item name="android:windowFullscreen">true</item>
-        <item name="colorAccent">@color/color_accent</item>
-    </style>
-
-    <style name="Theme.ownCloud.Splash" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
-        <item name="android:statusBarColor">@color/primary</item>
-        <item name="colorPrimary">@color/primary</item>
-        <item name="windowActionBar">false</item>
-        <item name="colorAccent">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary</item>
-    </style>
-
     <style name="Theme.ownCloud.Widget.ActionBar" parent="@style/Theme.MaterialComponents.Light.DarkActionBar.Bridge">
         <item name="android:background">@color/primary</item>
         <item name="background">@color/primary</item>
diff --git a/app/src/qa/google-services.json b/app/src/qa/google-services.json
@@ -8,7 +8,7 @@
             "client_info": {
                 "mobilesdk_app_id": "",
                 "android_client_info": {
-                    "package_name": "com.t_systems.android.webdav.beta"
+                    "package_name": "com.nextcloud.android.beta"
                 }
             },
             "oauth_client": [],
diff --git a/app/src/versionDev/google-services.json b/app/src/versionDev/google-services.json

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"client_info": {`
`9`	`9`	`"mobilesdk_app_id": "",`
`10`	`10`	`"android_client_info": {`
`11`		`- "package_name": "com.t_systems.android.webdav"`
	`11`	`+ "package_name": "com.nextcloud.client"`
`12`	`12`	`}`
`13`	`13`	`},`
`14`	`14`	`"oauth_client": [],`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ class ScanDocUploadWorker constructor(`
`56`	`56`	`const val DATA_SCAN_FILE_TYPES = "data_scan_file_types"`
`57`	`57`	`const val DATA_SCAN_PDF_PWD = "data_scan_pdf_pwd"`
`58`	`58`	`const val DATA_DOC_FILE_NAME = "data_doc_file_name"`
	`59`	`+ const val IMAGE_COMPRESSION_PERCENTAGE = 85`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`override fun doWork(): Result {`
`@@ -113,7 +114,7 @@ class ScanDocUploadWorker constructor(`
`113`	`114`	`private fun initScanBotSDK() {`
`114`	`115`	`scanbotSDK = ScanbotSDK(context)`
`115`	`116`	`pdfRenderer = scanbotSDK.createPdfRenderer()`
`116`		`- pageFileStorage = scanbotSDK.pageFileStorage`
	`117`	`+ pageFileStorage = scanbotSDK.createPageFileStorage()`
`117`	`118`	`opticalCharacterRecognizer = scanbotSDK.createOcrRecognizer()`
`118`	`119`	`}`
`119`	`120`
`@@ -125,7 +126,7 @@ class ScanDocUploadWorker constructor(`
`125`	`126`	`newFileName += "($i)"`
`126`	`127`	`}`
`127`	`128`
`128`		`- val jpgFile = FileUtils.saveJpgImage(context, bitmap, newFileName)`
	`129`	`+ val jpgFile = FileUtils.saveJpgImage(context, bitmap, newFileName, IMAGE_COMPRESSION_PERCENTAGE)`
`129`	`130`	`savedFiles.add(jpgFile.path)`
`130`	`131`	`}`
`131`	`132`	`}`
`@@ -138,7 +139,7 @@ class ScanDocUploadWorker constructor(`
`138`	`139`	`newFileName += "($i)"`
`139`	`140`	`}`
`140`	`141`
`141`		`- val pngFile = FileUtils.savePngImage(context, bitmap, newFileName)`
	`142`	`+ val pngFile = FileUtils.savePngImage(context, bitmap, newFileName, IMAGE_COMPRESSION_PERCENTAGE)`
`142`	`143`	`savedFiles.add(pngFile.path)`
`143`	`144`	`}`
`144`	`145`	`}`