Merge remote-tracking branch 'origin/next' into bugFix/cleanup-next

# Conflicts:
#	app/build.gradle.kts
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/net/opendasharchive/openarchive/features/settings/SettingsFragment.kt

Author: Elelan

app/build.gradle.kts

@@ -45,7 +45,7 @@ android {
         minSdk = 29
         //noinspection OldTargetApi
         targetSdk = 34
-        versionCode = 30006
+        versionCode = 30007
         versionName = "0.7.8"
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
@@ -76,6 +76,7 @@ android {
         getByName("debug") {
             val props = loadLocalProperties()
             storeFile = file(props["STOREFILE"] as? String ?: "")
+            storeFile = props["STOREFILE"]?.let { file(it) }
             storePassword = props["STOREPASSWORD"] as? String ?: ""
             keyAlias = props["KEYALIAS"] as? String ?: ""
             keyPassword = props["KEYPASSWORD"] as? String ?: ""
@@ -250,9 +251,9 @@ dependencies {
     implementation("com.google.api-client:google-api-client-android:1.26.0")
     implementation("com.google.apis:google-api-services-drive:v3-rev136-1.25.0")
 
-    // Tor Libraries
-    implementation(libs.tor.android)
-    implementation(libs.jtorctl)
+    // Internal Tor Libraries
+    //implementation(libs.tor.android)
+    //implementation(libs.jtorctl)
 
     implementation(libs.bitcoinj.core)
     implementation("com.eclipsesource.j2v8:j2v8:6.2.1@aar")
@@ -284,7 +285,7 @@ dependencies {
     implementation("com.github.derlio:audio-waveform:v1.0.1")
 
     implementation(libs.clean.insights)
-    implementation(libs.netcipher)
+    implementation(fileTree("libs"))
 
     // Mixpanel analytics
     implementation(libs.mixpanel)

app/libs/netcipher.aar

@@ -259,7 +259,7 @@
         <service
             android:name=".services.snowbird.service.SnowbirdService"
             android:exported="false"
-            android:foregroundServiceType="dataSync"></service>
+            android:foregroundServiceType="dataSync" />
 
     </application>
 

app/src/main/AndroidManifest.xml

@@ -0,0 +1,116 @@
+/*
+ * Copyright 2012-2016 Nathan Freitas
+ * Copyright 2015 str4d
+ * Portions Copyright (c) 2016 CommonsWare, LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package info.guardianproject.netcipher.client;
+
+import android.content.Context;
+import android.content.Intent;
+import javax.net.ssl.SSLSocketFactory;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+
+/**
+ * Creates an OkHttpClient using NetCipher configuration. Use
+ * build() if you have no other OkHttpClient configuration
+ * that you need to perform. Or, use applyTo() to augment an
+ * existing OkHttpClient.Builder with NetCipher.
+ */
+public class StrongOkHttpClientBuilder extends
+        StrongBuilderBase<StrongOkHttpClientBuilder, OkHttpClient> {
+  /**
+   * Creates a StrongOkHttpClientBuilder using the strongest set
+   * of options for security. Use this if the strongest set of
+   * options is what you want; otherwise, create a
+   * builder via the constructor and configure it as you see fit.
+   *
+   * @param context any Context will do
+   * @return a configured StrongOkHttpClientBuilder
+   * @throws Exception
+   */
+  static public StrongOkHttpClientBuilder forMaxSecurity(Context context)
+    throws Exception {
+    return(new StrongOkHttpClientBuilder(context)
+      .withBestProxy());
+  }
+
+  /**
+   * Creates a builder instance.
+   *
+   * @param context any Context will do; builder will hold onto
+   *             Application context
+   */
+  public StrongOkHttpClientBuilder(Context context) {
+    super(context);
+  }
+
+  /**
+   * Copy constructor.
+   *
+   * @param original builder to clone
+   */
+  public StrongOkHttpClientBuilder(StrongOkHttpClientBuilder original) {
+    super(original);
+  }
+
+  /**
+   * OkHttp3 does not support SOCKS proxies:
+   * https://github.com/square/okhttp/issues/2315
+   *
+   * @return false
+   */
+  @Override
+  public boolean supportsSocksProxy() {
+    return(false);
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public OkHttpClient build(Intent status) {
+    return(applyTo(new OkHttpClient.Builder(), status).build());
+  }
+
+  /**
+   * Adds NetCipher configuration to an existing OkHttpClient.Builder,
+   * in case you have additional configuration that you wish to
+   * perform.
+   *
+   * @param builder a new or partially-configured OkHttpClient.Builder
+   * @return the same builder
+   */
+  public OkHttpClient.Builder applyTo(OkHttpClient.Builder builder, Intent status) {
+    SSLSocketFactory factory=buildSocketFactory();
+
+    if (factory!=null) {
+      builder.sslSocketFactory(factory);
+    }
+
+    return(builder
+      .proxy(buildProxy(status)));
+  }
+
+  @Override
+  protected String get(Intent status, OkHttpClient connection,
+                       String url) throws Exception {
+    Request request=new Request.Builder().url(TOR_CHECK_URL).build();
+
+    return(connection.newCall(request).execute().body().string());
+  }
+}

app/src/main/java/info/guardianproject/netcipher/client/StrongOkHttpClientBuilder.java

@@ -22,7 +22,6 @@ import net.opendasharchive.openarchive.core.logger.AppLogger
 import net.opendasharchive.openarchive.features.settings.passcode.PasscodeManager
 import net.opendasharchive.openarchive.util.Analytics
 import net.opendasharchive.openarchive.util.Prefs
-import net.opendasharchive.openarchive.util.Theme
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
@@ -69,7 +68,7 @@ class SaveApp : SugarApp(), SingletonImageLoader.Factory {
         Prefs.load(this)
         applyTheme()
 
-        if (Prefs.useTor) initNetCipher()
+        initNetCipher()
 
         CleanInsightsManager.init(this)
 
@@ -78,13 +77,17 @@ class SaveApp : SugarApp(), SingletonImageLoader.Factory {
 
     private fun initNetCipher() {
         AppLogger.d("Initializing NetCipher client")
-        val oh = OrbotHelper.get(this)
 
-        if (BuildConfig.DEBUG) {
-            oh.skipOrbotValidation()
+        OrbotHelper.get(this).apply {
+            if (BuildConfig.DEBUG) {
+                skipOrbotValidation()
+            }
+            init()
         }
 
-//        oh.init()
+        if (Prefs.useTor) {
+            OrbotHelper.requestStartTor(this@SaveApp)
+        }
     }
 
     private fun createSnowbirdNotificationChannel() {

app/src/main/java/net/opendasharchive/openarchive/SaveApp.kt

@@ -1,14 +1,12 @@
 package net.opendasharchive.openarchive.core.di
 
-import android.content.Context
-import com.google.api.services.drive.Drive
-import com.thegrizzlylabs.sardineandroid.impl.OkHttpSardine
-import net.opendasharchive.openarchive.features.core.dialog.DefaultResourceProvider
 import net.opendasharchive.openarchive.features.core.dialog.DialogStateManager
 import net.opendasharchive.openarchive.features.core.dialog.ResourceProvider
+import net.opendasharchive.openarchive.features.core.dialog.DefaultResourceProvider
 import net.opendasharchive.openarchive.features.folders.BrowseFoldersViewModel
-import net.opendasharchive.openarchive.features.main.MainViewModel
 import net.opendasharchive.openarchive.features.main.ui.HomeViewModel
+import net.opendasharchive.openarchive.features.main.MainViewModel
+import net.opendasharchive.openarchive.services.servicesModule
 import org.koin.android.ext.koin.androidApplication
 import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
@@ -27,10 +25,9 @@ val coreModule = module {
     }
 
     viewModel {
-        BrowseFoldersViewModel(
-            context = get<Context>()
-        )
+        BrowseFoldersViewModel(get())
     }
+    includes(servicesModule)
 }
 
 

app/src/main/java/net/opendasharchive/openarchive/core/di/CoreModule.kt

@@ -10,17 +10,16 @@ import java.io.IOException
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 
-suspend fun <T> OkHttpClient.enqueueResult(
-    request: Request,
-    onResume: (Response) -> T
-) = suspendCancellableCoroutine { continuation ->
+suspend fun OkHttpClient.enqueueResult(
+    request: Request
+): Result<Response> = suspendCancellableCoroutine { continuation ->
     newCall(request).enqueue(object : Callback {
         override fun onFailure(call: Call, e: IOException) {
             continuation.resumeWithException(e)
         }
 
         override fun onResponse(call: Call, response: Response) {
-            continuation.resume(onResume(response))
+            continuation.resume(Result.success(response))
         }
     })