Merge branch 'trunk' into ui_fixes

android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt

@@ -24,6 +24,7 @@ import io.flutter.plugin.common.EventChannel
 import kotlin.concurrent.thread
 
 import org.json.JSONObject
+import java.io.File
 
 class MainActivity: FlutterActivity() {
 
@@ -60,6 +61,7 @@ class MainActivity: FlutterActivity() {
         val ainfo = this.applicationContext.packageManager.getApplicationInfo(
                 "im.cwtch.flwtch", // Must be app name
                 PackageManager.GET_SHARED_LIBRARY_FILES)
+
         return ainfo.nativeLibraryDir
     }
 

android/gradle.properties

@@ -2,3 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
+android.bundle.enableUncompressedNativeLibs=false

lib/cwtch/ffi.dart

@@ -82,6 +82,7 @@ class CwtchFfi implements Cwtch {
     Map<String, String> envVars = Platform.environment;
     if (Platform.isLinux) {
       home = (envVars['HOME'])!;
+      bundledTor = "./tor";
     } else if (Platform.isWindows) {
       home = (envVars['UserProfile'])!;
       bundledTor = "Tor\\Tor\\tor.exe";

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.0+1
+version: 1.0.0+8
 
 environment:
   sdk: ">=2.12.0 <3.0.0"