Merge pull request #343 from Horizontal-org/feat/release_2.14.0(196)

merge release 2.14.0 to main

Author: wafalakhal

build.gradle

@@ -72,6 +72,8 @@ buildscript {
     versions.permissionDispatcher = "4.8.0"
     versions.googlePlayServices = "17.0.0"
     versions.pdf_viewer = "2.8.2"
+    versions.nextcloud = "2.19.1"
+    versions.fidoVersion = "4.1.0-patch1"
     versions.divviup = "0.2.0"
     versions.credentialsVersion = '1.2.2'
     versions.googleIdVersion = '1.1.1'
@@ -83,6 +85,7 @@ buildscript {
     versions.googleApiClientGsonVersion = '1.34.0'
     versions.dropboxVersion = '7.0.0'
 
+
     repositories {
         mavenCentral()
         jcenter()

mobile/build.gradle

@@ -14,8 +14,8 @@ android {
         minSdkVersion versions.minSdk
         compileSdkVersion versions.compileSdk
         targetSdkVersion versions.targetSdk
-        versionCode 191
-        versionName "2.13.1"
+        versionCode 196
+        versionName "2.14.0"
         multiDexEnabled true
 
         ndk {
@@ -47,9 +47,8 @@ android {
     }
 
     configurations.all {
-        // resolutionStrategy.force "com.android.support:exifinterface:${supportLibVersion}"
-        // resolutionStrategy.force "com.android.support:animated-vector-drawble:${supportLibVersion}"
-        // resolutionStrategy.force "com.android.support:support-v13:${supportLibVersion}"
+        exclude group: "org.slf4j", module: "slf4j-log4j12"
+        exclude group: "log4j", module: "log4j"
     }
 
     buildTypes {
@@ -86,6 +85,10 @@ android {
         enableExperimentalClasspathAggregation = true
         enableAggregatingTask = true
 
+    }
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+
     }
     namespace 'rs.readahead.washington.mobile'
 }
@@ -216,6 +219,20 @@ dependencies {
     implementation "com.google.code.gson:gson:$versions.gsonVersion"
     implementation "com.dropbox.core:dropbox-core-sdk:$versions.dropboxVersion"
     implementation "com.dropbox.core:dropbox-android-sdk:$versions.dropboxVersion"
+
+    //Next cloud
+    implementation ("com.github.nextcloud:android-library:$versions.nextcloud") {
+        exclude group: 'org.ogce', module: 'xpp3'
+        exclude group: 'commons-logging', module: 'commons-logging' // Exclude commons-logging
+        exclude group: 'org.slf4j', module: 'jcl-over-slf4j' // Optionally exclude jcl-over-slf4j
+
+    }
+    implementation "commons-httpclient:commons-httpclient:3.1@jar" // remove after entire switch to lib v2
+    implementation 'org.conscrypt:conscrypt-android:2.5.2'
+
+    implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$versions.fidoVersion"
+    implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:$versions.fidoVersion"
+
 }
 
 def getLocalProperties() {

mobile/proguard-rules.pro

@@ -240,6 +240,8 @@
 
 # Android-Image-Cropper
 -keep class androidx.appcompat.widget.** { *; }
+-keep class org.apache.commons.** { *; }
+
 
 -if class androidx.credentials.CredentialManager
 -keep class androidx.credentials.playservices.** {

mobile/src/main/AndroidManifest.xml

@@ -53,6 +53,7 @@
         android:roundIcon="@mipmap/tella_icon_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:allowBackup"
         tools:targetApi="n">
@@ -658,6 +659,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppTheme.NoActionBar" />
 
+        <activity
+            android:name=".views.dialog.nextcloud.NextCloudLoginFlowActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:theme="@style/AppTheme.NoActionBar" />
+
         <meta-data
             android:name="preloaded_fonts"
             android:resource="@array/preloaded_fonts" />

mobile/src/main/java/rs/readahead/washington/mobile/MyApplication.java

@@ -6,9 +6,13 @@
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
+import android.os.StrictMode;
 import android.os.Bundle;
 import android.widget.Toast;
 
@@ -35,9 +39,14 @@
 import com.hzontal.tella_locking_ui.ui.pin.PinUnlockActivity;
 import com.hzontal.tella_vault.Vault;
 import com.hzontal.tella_vault.rx.RxVault;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 import org.hzontal.shared_ui.data.CommonPrefs;
 
+import net.zetetic.database.sqlcipher.SQLiteDatabase;
+
+import org.conscrypt.Conscrypt;
 import org.hzontal.tella.keys.MainKeyStore;
 import org.hzontal.tella.keys.TellaKeys;
 import org.hzontal.tella.keys.config.IUnlockRegistryHolder;
@@ -51,14 +60,23 @@
 import org.hzontal.tella.keys.wrapper.UnencryptedKeyWrapper;
 
 import java.io.File;
+import java.lang.ref.WeakReference;
+import java.security.NoSuchAlgorithmException;
+import java.security.Security;
+import java.util.Arrays;
 
 import javax.inject.Inject;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
 
 import dagger.hilt.android.HiltAndroidApp;
+import de.cotech.hw.SecurityKeyManager;
+import de.cotech.hw.SecurityKeyManagerConfig;
 import io.reactivex.functions.Consumer;
 import io.reactivex.plugins.RxJavaPlugins;
 import rs.readahead.washington.mobile.bus.TellaBus;
 import rs.readahead.washington.mobile.data.database.KeyDataSource;
+import rs.readahead.washington.mobile.data.nextcloud.TempFileManager;
 import rs.readahead.washington.mobile.data.rest.BaseApi;
 import rs.readahead.washington.mobile.data.sharedpref.Preferences;
 import rs.readahead.washington.mobile.data.sharedpref.SharedPrefs;
@@ -72,11 +90,11 @@
 import rs.readahead.washington.mobile.views.activity.ExitActivity;
 import rs.readahead.washington.mobile.views.activity.MainActivity;
 import rs.readahead.washington.mobile.views.activity.onboarding.OnBoardingActivity;
+import rs.readahead.washington.mobile.views.dialog.nextcloud.NextCloudLoginFlowActivity;
 import timber.log.Timber;
 
 @HiltAndroidApp
-public class MyApplication extends MultiDexApplication implements IUnlockRegistryHolder, CredentialsCallback, Configuration.Provider, Application.ActivityLifecycleCallbacks
-{
+public class MyApplication extends MultiDexApplication implements IUnlockRegistryHolder, CredentialsCallback, Configuration.Provider, Application.ActivityLifecycleCallbacks {
     public static Vault vault;
     public static RxVault rxVault;
     private static TellaBus bus;
@@ -90,6 +108,10 @@ public class MyApplication extends MultiDexApplication implements IUnlockRegistr
     @Inject
     DivviupUtils divviupUtils;
     Vault.Config vaultConfig;
+    private static final String TAG = MyApplication.class.getSimpleName();
+    public static final String DOT = ".";
+    public static final OwnCloudVersion MINIMUM_SUPPORTED_SERVER_VERSION = OwnCloudVersion.nextcloud_17;
+    private static WeakReference<Context> appContext;
     private long startTime;
     private long totalTimeSpent = 0; // Store total time spent in the app
     private int activityReferences = 0;
@@ -164,7 +186,6 @@ protected void attachBaseContext(Context newBase) {
     @Override
     public void onCreate() {
         super.onCreate();
-
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
 
         //ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
@@ -192,7 +213,10 @@ public void onCreate() {
         //initialize WorkManager
         //  WorkManager.initialize(this, myConfig);
 
-        RxJavaPlugins.setErrorHandler(new Consumer<>() {
+        System.setProperty("javax.net.debug", "ssl,handshake");
+
+
+        RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
             @Override
             public void accept(Throwable throwable) {
                 Timber.d(throwable, getClass().getName());
@@ -220,6 +244,8 @@ public void accept(Throwable throwable) {
         mainKeyHolder = new LifecycleMainKey(ProcessLifecycleOwner.get().getLifecycle(), Preferences.getLockTimeout());
         keyDataSource = new KeyDataSource(getApplicationContext());
         TellaKeysUI.initialize(mainKeyStore, mainKeyHolder, unlockRegistry, this, Preferences.getFailedUnlockOption(), Preferences.getUnlockRemainingAttempts(), Preferences.isShowUnlockRemainingAttempts());
+        insertConscrypt();
+        enableStrictMode();
     }
 
     private void configureCrashlytics() {
@@ -350,6 +376,7 @@ public void onActivityStarted(Activity activity) {
             startTime = System.currentTimeMillis(); // Start tracking time
         }
     }
+
     @Override
     public void onActivityResumed(@NonNull Activity activity) {
 
@@ -369,6 +396,7 @@ public void onActivityStopped(Activity activity) {
             totalTimeSpent += spentTime; // Add to total time spent
             Preferences.setTimeSpent(totalTimeSpent); // Save the time to shared preferences
             divviupUtils.runTimeSpentEvent(totalTimeSpent); // Send analytics if needed
+            TempFileManager.INSTANCE.deleteAllFiles();
         }
     }
 
@@ -381,4 +409,43 @@ public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bun
     public void onActivityDestroyed(@NonNull Activity activity) {
 
     }
+
+    private void insertConscrypt() {
+        Security.insertProviderAt(Conscrypt.newProvider(), 1);
+
+        try {
+            Conscrypt.Version version = Conscrypt.version();
+            Log_OC.i(TAG, "Using Conscrypt/"
+                    + version.major()
+                    + DOT
+                    + version.minor()
+                    + DOT + version.patch()
+                    + " for TLS");
+            SSLEngine engine = SSLContext.getDefault().createSSLEngine();
+            Log_OC.i(TAG, "Enabled protocols: " + Arrays.toString(engine.getEnabledProtocols()) + " }");
+            Log_OC.i(TAG, "Enabled ciphers: " + Arrays.toString(engine.getEnabledCipherSuites()) + " }");
+        } catch (NoSuchAlgorithmException e) {
+            Log_OC.e(TAG, e.getMessage());
+        }
+    }
+
+
+    private void enableStrictMode() {
+        if (BuildConfig.DEBUG) {
+            Log_OC.d(TAG, "Enabling StrictMode");
+            StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
+                    .detectDiskReads()
+                    .detectDiskWrites()
+                    .detectAll()
+                    .penaltyLog()
+                    .build());
+            StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
+                    .detectLeakedSqlLiteObjects()
+                    .detectLeakedClosableObjects()
+                    .penaltyLog()
+                    .build());
+        }
+    }
+
+
 }

mobile/src/main/java/rs/readahead/washington/mobile/data/database/D.java

@@ -16,7 +16,7 @@ class D {
 
     // 1=start,2=form media file status,3=updated flag in xforms
     // 4=xml form part status,5=media file hash,6=tella upload server,7=file uploads table
-    static final int DATABASE_VERSION = 15;
+    static final int DATABASE_VERSION = 16;
     static final int MIN_DATABASE_VERSION = 1;
 
     /* DATABASE TABLES */
@@ -26,6 +26,7 @@ class D {
     static final String T_REPORT_FORM_INSTANCE = "t_report_form_instance";
     static final String T_GOOGLE_DRIVE_FORM_INSTANCE = "t_google_drive_form_instance";
     static final String T_DROPBOX_FORM_INSTANCE = "t_dropbox_form_instance";
+    static final String T_NEXT_CLOUD_FORM_INSTANCE = "t_next_cloud_form_instance";
     static final String T_MEDIA_FILE = "t_media_file";
     static final String T_COLLECT_FORM_INSTANCE_MEDIA_FILE = "t_collect_xform_instance_media_file";
     static final String T_SETTINGS = "t_settings";
@@ -52,6 +53,7 @@ class D {
     static final String C_PATH = "c_path";
     static final String C_URL = "c_url";
     static final String C_USERNAME = "c_username";
+    static final String C_USERID = "c_userid";
     static final String C_PASSWORD = "c_password";
     static final String C_VERSION = "c_version";
     static final String C_HASH = "c_hash";
@@ -109,6 +111,7 @@ class D {
     static final String C_UWAZI_ENTITY_INSTANCE_ID = "c_uwazi_entity_instance_id";
     static final String T_REPORT_INSTANCE_VAULT_FILE = "t_report_instance_vault_file";
     static final String T_GOOGLE_DRIVE_INSTANCE_VAULT_FILE = "t_google_drive_instance_vault_file";
+    static final String T_NEXT_CLOUD_INSTANCE_VAULT_FILE = "t_next_cloud_instance_vault_file";
     static final String T_DROPBOX_INSTANCE_VAULT_FILE = "t_dropbox_instance_vault_file";
     static final String C_REPORT_INSTANCE_ID = "c_report_instance_id";
     static final String C_UPLOADED_SIZE = "c_uploaded_size";
@@ -138,6 +141,13 @@ class D {
     static final String C_RESOURCES_PROJECT = "c_resources_project";
     static final String C_RESOURCES_FILE_ID = "c_resources_file_id";
 
+    /* NEXT CLOUD */
+    static final String T_NEXT_CLOUD = "t_next_cloud";
+    static final String C_NEXT_CLOUD_SERVER_NAME = "c_next_cloud_server_name";
+    static final String C_NEXT_CLOUD_FOLDER_ID = "c_next_cloud_folder_id";
+    static final String C_NEXT_CLOUD_FOLDER_NAME = "c_next_cloud_folder_name";
+    static final String C_NEXT_CLOUD_USER_ID = "c_next_cloud_user_id";
+
     /* GOOGLE DRIVE */
     static final String T_GOOGLE_DRIVE = "t_google_drive";
     static final String C_GOOGLE_DRIVE_FOLDER_ID = "c_google_drive_folder_id";

mobile/src/main/java/rs/readahead/washington/mobile/data/database/KeyDataSource.java

@@ -14,6 +14,7 @@ public class KeyDataSource {
     private final AsyncSubject<ResourceDataSource> asyncResourceSubject;
     private final AsyncSubject<GoogleDriveDataSource> asyncGoogleDriveSubject;
     private final AsyncSubject<DropBoxDataSource> asyncDropBoxSubject;
+    private final AsyncSubject<NextCloudDataSource> asyncNextCloudSubject;
     private final Context context;
 
     public KeyDataSource(Context context) {
@@ -23,6 +24,7 @@ public KeyDataSource(Context context) {
         asyncResourceSubject = AsyncSubject.create();
         asyncGoogleDriveSubject = AsyncSubject.create();
         asyncDropBoxSubject = AsyncSubject.create();
+        asyncNextCloudSubject = AsyncSubject.create();
     }
 
     public void initKeyDataSource() {
@@ -41,6 +43,9 @@ public void initKeyDataSource() {
 
             asyncDropBoxSubject.onNext(DropBoxDataSource.getInstance(this.context, MyApplication.getMainKeyHolder().get().getKey().getEncoded()));
             asyncDropBoxSubject.onComplete();
+
+            asyncNextCloudSubject.onNext(NextCloudDataSource.getInstance(this.context, MyApplication.getMainKeyHolder().get().getKey().getEncoded()));
+            asyncNextCloudSubject.onComplete();
         } catch (LifecycleMainKey.MainKeyUnavailableException e) {
             e.printStackTrace();
         }
@@ -66,5 +71,9 @@ public Observable<DropBoxDataSource> getDropBoxDataSource() {
         return asyncDropBoxSubject;
     }
 
+    public Observable<NextCloudDataSource> getNextCloudDataSource() {
+        return asyncNextCloudSubject;
+    }
+
 }