add slovak translation

wrong file name

.drone.yml

@@ -8,7 +8,7 @@ clone:
 
 steps:
   - name: clone
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.3.8
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -24,7 +24,7 @@ steps:
       - git checkout $DRONE_COMMIT
 
   - name: fetch
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.3.8
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -47,7 +47,7 @@ steps:
   #    #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting
 
   - name: build-linux
-    image: openpriv/flutter-desktop:linux-fstable-2.8.0
+    image: openpriv/flutter-desktop:linux-fstable-3.3.9
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -60,8 +60,20 @@ steps:
       - tar -czf cwtch-`cat ../VERSION`.tar.gz cwtch
       - rm -r cwtch
 
+  - name: linux-ui-tests
+    image: openpriv/flutter-desktop:linux-fstable-3.3.9
+    volumes:
+      - name: deps
+        path: /root/.pub-cache
+    commands:
+      - # todo: add xvfb to openpriv/flutter-desktop:linux-fstable-3.7
+      - sudo apt update
+      - sudo apt-get install -y xvfb
+      - ./fetch-tor.sh
+      - ./run-tests-headless.sh 02_save_load
+
   - name: test-build-android
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.3.8
     when:
       event: pull_request
     volumes:
@@ -71,7 +83,7 @@ steps:
       - flutter build apk --debug
 
   - name: build-android
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.3.8
     when:
       event: push
     environment:
@@ -95,7 +107,7 @@ steps:
       #- cp build/app/outputs/flutter-apk/app-debug.apk deploy/android
 
   - name: widget-tests
-    image: cirrusci/flutter:2.8.0
+    image: cirrusci/flutter:3.3.8
     volumes:
       - name: deps
         path: /root/.pub-cache
@@ -177,7 +189,7 @@ clone:
 
 steps:
   - name: clone
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.3.8
     environment:
       buildbot_key_b64:
         from_secret: buildbot_key_b64
@@ -195,16 +207,15 @@ steps:
       - git checkout $Env:DRONE_COMMIT
 
   - name: fetch
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.3.8
     commands:
-      - powershell -command "Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.6.5.zip -OutFile tor.zip"
-      - powershell -command "if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '7917561a7a063440a1ddfa9cb544ab9ffd09de84cea3dd66e3cc9cd349dd9f85b74a522ec390d7a974bc19b424c4d53af60e57bbc47e763d13cab6a203c4592f' ) { Write-Error 'tor.zip sha512sum mismatch' }"
       - git describe --tags --abbrev=1 > VERSION
       - powershell -command "Get-Date -Format 'yyyy-MM-dd-HH-mm'" > BUILDDATE
+      - .\fetch-tor-win.ps1
       - .\fetch-libcwtch-go.ps1
 
   - name: build-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.3.8
     commands:
       - flutter pub get
       - $Env:version += type .\VERSION
@@ -230,7 +241,7 @@ steps:
       status: [ success ]
     environment:
       pfx:
-        from_secret: pfx
+        from_secret: pfx2022_b64
       pfx_pass:
         from_secret: pfx_pass
     commands:
@@ -246,6 +257,8 @@ steps:
       - echo $Env:pfx > codesign.pfx.b64
       - certutil -decode codesign.pfx.b64 codesign.pfx
       - signtool sign /v /fd sha256 /a /f codesign.pfx /p $Env:pfx_pass /tr http://timestamp.digicert.com $Env:releasedir\cwtch.exe
+      - signtool sign /v /fd sha256 /a /f codesign.pfx /p $Env:pfx_pass /tr http://timestamp.digicert.com $Env:releasedir\libCwtch.dll
+      - signtool sign /v /fd sha256 /a /f codesign.pfx /p $Env:pfx_pass /tr http://timestamp.digicert.com $Env:releasedir\flutter_windows.dll
       - copy windows\runner\resources\knot_128.ico $Env:releasedir\cwtch.ico
       - makensis windows\nsis\cwtch-installer.nsi
       - move windows\nsis\cwtch-installer.exe cwtch-installer.exe
@@ -261,7 +274,7 @@ steps:
       - move *.sha512 deploy\$Env:builddir
 
   - name: deploy-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-2.8.1
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.3.8
     when:
       event: push
       status: [ success ]
@@ -361,4 +374,4 @@ trigger:
   branch: trunk
   event:
     - push
-    - pull_request
+    - pull_request

.gitignore

@@ -40,10 +40,31 @@ app.*.symbols
 # Obfuscation related
 app.*.map.json
 
+# Tor
+*data-dir*
+
+# Test Artificats
+*.log
+flutter_gherkin
+run-tests.env
+report.json
+package.
+
+# Compiled Libs
 linux/tor
 linux/libCwtch.so
 android/cwtch/cwtch.aar
 android/app/src/main/jniLibs/*/libtor.so
+*.dylib
+integration_test/gherkin_suite_test.g.dart
+integration_test/gherkin_suite_test.dart
+integration_test/gherkin/
+integration_test/CustomSteps.md
+analysis_options.yaml
+integration_test/env/default/tor
+linux/Tor
+linux/tor.tar.gz
+
 coverage
 test/failures
 .gradle

LIBCWTCH-GO-MACOS.version

@@ -1 +1 @@
-2022-01-07-16-29-v1.5.4
+2022-12-12-17-58-v1.10.1-3-g3d0a3a5

LIBCWTCH-GO.version

@@ -1 +1 @@
-2022-01-07-21-30-v1.5.4
+2022-12-12-22-59-v1.10.1-3-g3d0a3a5

README.md

@@ -65,7 +65,7 @@ To build a release version and load normal profiles, use `build-release.sh X` in
 ### Building on MacOS
 
 - Cocaopods is required, you may need to `gem install cocaopods -v 1.9.3`
-- copy `libCwtch.dylib` into the root folder, or run `fetch-libcwtch-go-macos.sh` to download it
+- copy `libCwtch.x64.dylib` and `libCwtch.arm/dylib` into the root folder, or run `fetch-libcwtch-go-macos.sh` to download it
 - run `fetch-tor-macos.sh` to fetch Tor or Download and install Tor Browser and `cp -r /Applications/Tor\ Browser.app/Contents/MacOS/Tor ./macos/`
 - `flutter build macos`
 - optional: launch cwtch-ui release build with `./build/macos/Build/Products/Release/Cwtch.app/Contents/MacOS/Cwtch`

android/app/build.gradle

@@ -33,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -48,9 +48,11 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "im.cwtch.flwtch"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
 
     signingConfigs {
@@ -89,16 +91,27 @@ dependencies {
     implementation project(':cwtch')
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
-    implementation "com.airbnb.android:lottie:3.5.0"
+    implementation "com.airbnb.android:lottie:4.2.1"
+    implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
     implementation "com.android.support.constraint:constraint-layout:2.0.4"
 
+    // Test Dependencies
+    testImplementation 'junit:junit:4.12'
+
+    // https://developer.android.com/jetpack/androidx/releases/test/#1.2.0
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
     // WorkManager
 
     // (Java only)
     //implementation("androidx.work:work-runtime:$work_version")
 
     // Kotlin + coroutines
-    implementation("androidx.work:work-runtime-ktx:2.5.0")
+    // 2022.06: upgraded from 2.5 to 2.7 for android 12
+    // err: "requires that one of FLAG_IMMUTABLE or FLAG_MUTABLE be specified when creating a PendingIntent"
+    // as per https://github.com/flutter/flutter/issues/93609
+    implementation 'androidx.work:work-runtime-ktx:2.7.0'
 
     // optional - RxJava2 support
     //implementation("androidx.work:work-rxjava2:$work_version")

android/app/src/androidTest/java/im/cwtch/flwtch/MainActivityTest.java

@@ -0,0 +1,12 @@
+package im.cwtch.flwtch;
+
+import androidx.test.rule.ActivityTestRule;
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(FlutterTestRunner.class)
+public class MainActivityTest {
+    @Rule
+    public ActivityTestRule<MainActivity> rule = new ActivityTestRule<>(MainActivity.class, true, false);
+}

android/app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
     <application
-        android:name="io.flutter.app.FlutterApplication"
+        android:name="${applicationName}"
         android:label="Cwtch"
         android:extractNativeLibs="true"
         android:icon="@mipmap/knott">
@@ -16,7 +16,8 @@
             android:theme="@style/NormalTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:exported="true">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
@@ -46,7 +47,15 @@
     <!--Needed to run in background (lol)-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
-    <!--Meeded to check if activity is foregrounded or if messages from the service should be queued-->
+    <!-- Ability to ask user to exempt app from power management (which can kill it more frequently especially on some devices.
+         Allows app to use ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS -->
+    <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+
+    <!-- TODO when we support sdk 31
+    <uses-permission-sdk-23 android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
+    -->
+
+    <!--Needed to check if activity is foregrounded or if messages from the service should be queued-->
     <uses-permission android:name="android.permission.GET_TASKS" />
 
     <queries>

android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java

@@ -0,0 +1,25 @@
+// Generated file.
+//
+// If you wish to remove Flutter's multidex support, delete this entire file.
+//
+// Modifications to this file should be done in a copy under a different name
+// as this file may be regenerated.
+
+package io.flutter.app;
+
+import android.app.Application;
+import android.content.Context;
+import androidx.annotation.CallSuper;
+import androidx.multidex.MultiDex;
+
+/**
+ * Extension of {@link android.app.Application}, adding multidex support.
+ */
+public class FlutterMultiDexApplication extends Application {
+  @Override
+  @CallSuper
+  protected void attachBaseContext(Context base) {
+    super.attachBaseContext(base);
+    MultiDex.install(this);
+  }
+}

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

@@ -1,24 +1,27 @@
 package im.cwtch.flwtch
 
-import android.app.*
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.graphics.Color
+import android.net.Uri
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import androidx.work.*
+import androidx.work.CoroutineWorker
+import androidx.work.ForegroundInfo
+import androidx.work.WorkerParameters
 import cwtch.Cwtch
 import io.flutter.FlutterInjector
 import org.json.JSONObject
-
 import java.nio.file.Files
 import java.nio.file.Paths
-import java.nio.file.StandardCopyOption
-import android.net.Uri
 
 class FlwtchWorker(context: Context, parameters: WorkerParameters) :
         CoroutineWorker(context, parameters) {
@@ -29,13 +32,26 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
     private var notificationID: MutableMap<String, Int> = mutableMapOf()
     private var notificationIDnext: Int = 1
 
+    private var notificationSimple: String? =  null
+    private var notificationConversationInfo: String? = null
+
+    private val TAG: String = "FlwtchWorker.kt"
+
+
     override suspend fun doWork(): Result {
+        // Hack to uncomment and deploy if your device has zombie workers you need to kill
+        // We need a proper solution but this will clear those out for now
+        /*if (notificationSimple == null) {
+            Log.e("FlwtchWorker", "doWork found notificationSimple is null, app has not started, this is a stale thread, terminating")
+            return Result.failure()
+        }*/
+
         val method = inputData.getString(KEY_METHOD)
                 ?: return Result.failure()
         val args = inputData.getString(KEY_ARGS)
                 ?: return Result.failure()
         // Mark the Worker as important
-        val progress = "Cwtch is keeping Tor running in the background"//todo:translate
+        val progress = "Cwtch is keeping Tor running in the background" // TODO: translate
         setForeground(createForegroundInfo(progress))
         return handleCwtch(method, args)
     }
@@ -49,334 +65,198 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
     }
 
     private fun handleCwtch(method: String, args: String): Result {
-        val a = JSONObject(args)
-        when (method) {
-            "Start" -> {
-                Log.i("FlwtchWorker.kt", "handleAppInfo Start")
-                val appDir = (a.get("appDir") as? String) ?: ""
-                val torPath = (a.get("torPath") as? String) ?: "tor"
-                Log.i("FlwtchWorker.kt", "appDir: '$appDir' torPath: '$torPath'")
+            if (method != "Start") {
+                if (Cwtch.started() != 1.toLong()) {
+                    Log.e(TAG, "libCwtch-go reports it is not initialized yet")
+                    return Result.failure()
+                }
+            }
 
-                if (Cwtch.startCwtch(appDir, torPath) != 0.toLong()) return Result.failure()
+            val a = JSONObject(args)
+            when (method) {
+                "Start" -> {
+                    Log.i(TAG, "handleAppInfo Start")
+                    val appDir = (a.get("appDir") as? String) ?: ""
+                    val torPath = (a.get("torPath") as? String) ?: "tor"
+                    Log.i(TAG, "appDir: '$appDir' torPath: '$torPath'")
 
-                Log.i("FlwtchWorker.kt", "startCwtch success, starting coroutine AppbusEvent loop...")
-                val downloadIDs = mutableMapOf<String, Int>()
-                while(true) {
-                    val evt = MainActivity.AppbusEvent(Cwtch.getAppBusEvent())
-                    if (evt.EventType == "NewMessageFromPeer" || evt.EventType == "NewMessageFromGroup") {
-                        val data = JSONObject(evt.Data)
-                        val handle = if (evt.EventType == "NewMessageFromPeer") data.getString("RemotePeer") else data.getString("GroupID");
-                        if (data["RemotePeer"] != data["ProfileOnion"]) {
-                            val channelId =
-                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                        createMessageNotificationChannel(handle, handle)
-                                    } else {
-                                        // If earlier version channel ID is not used
-                                        // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
-                                        ""
+                    if (Cwtch.startCwtch(appDir, torPath) != 0.toLong()) return Result.failure()
+
+                    Log.i(TAG, "startCwtch success, starting coroutine AppbusEvent loop...")
+                    val downloadIDs = mutableMapOf<String, Int>()
+                    var flags = PendingIntent.FLAG_UPDATE_CURRENT
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                        flags = flags or PendingIntent.FLAG_IMMUTABLE
+                    }
+                    while (true) {
+                        try {
+                            val evt = MainActivity.AppbusEvent(Cwtch.getAppBusEvent())
+                            // TODO replace this notification block with the NixNotification manager in dart as it has access to contact names and also needs less working around
+
+                            if (evt.EventType == "NewMessageFromPeer" || evt.EventType == "NewMessageFromGroup") {
+                                val data = JSONObject(evt.Data)
+                                val handle = data.getString("RemotePeer");
+                                val conversationId = data.getInt("ConversationID").toString();
+                                val notificationChannel = if (evt.EventType == "NewMessageFromPeer") handle else conversationId
+                                if (data["RemotePeer"] != data["ProfileOnion"]) {
+                                    val notification = data["notification"]
+
+                                    if (notification == "SimpleEvent") {
+                                        val channelId =
+                                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                                    createMessageNotificationChannel("Cwtch", "Cwtch")
+                                                } else {
+                                                    // If earlier version channel ID is not used
+                                                    // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
+                                                    ""
+                                                }
+
+                                        val clickIntent = Intent(applicationContext, MainActivity::class.java).also { intent ->
+                                            intent.action = Intent.ACTION_RUN
+                                            intent.putExtra("EventType", "NotificationClicked")
+                                        }
+                                        val newNotification = NotificationCompat.Builder(applicationContext, channelId)
+                                                .setContentTitle("Cwtch")
+                                                .setContentText(notificationSimple ?: "New Message")
+                                                .setSmallIcon(R.mipmap.knott_transparent)
+                                                .setContentIntent(PendingIntent.getActivity(applicationContext, 1, clickIntent, flags))
+                                                .setAutoCancel(true)
+                                                .build()
+
+                                        notificationManager.notify(getNotificationID("Cwtch", "Cwtch"), newNotification)
+                                    } else if (notification == "ContactInfo") {
+                                        val channelId =
+                                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                                    createMessageNotificationChannel(notificationChannel, notificationChannel)
+                                                } else {
+                                                    // If earlier version channel ID is not used
+                                                    // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
+                                                    ""
+                                                }
+                                        val loader = FlutterInjector.instance().flutterLoader()
+                                        Log.i(TAG, "notification for " + evt.EventType + " " + handle + " " + conversationId + " " + channelId)
+                                        Log.i(TAG, data.toString());
+                                        val key = loader.getLookupKeyForAsset(data.getString("picture"))//"assets/profiles/001-centaur.png")
+                                        val fh = applicationContext.assets.open(key)
+
+                                        val clickIntent = Intent(applicationContext, MainActivity::class.java).also { intent ->
+                                            intent.action = Intent.ACTION_RUN
+                                            intent.putExtra("EventType", "NotificationClicked")
+                                            intent.putExtra("ProfileOnion", data.getString("ProfileOnion"))
+                                            intent.putExtra("Handle", handle)
+                                        }
+
+                                        val newNotification = NotificationCompat.Builder(applicationContext, channelId)
+                                                .setContentTitle(data.getString("Nick"))
+                                                .setContentText((notificationConversationInfo
+                                                        ?: "New Message From %1").replace("%1", data.getString("Nick")))
+                                                .setLargeIcon(BitmapFactory.decodeStream(fh))
+                                                .setSmallIcon(R.mipmap.knott_transparent)
+                                                .setContentIntent(PendingIntent.getActivity(applicationContext, 1, clickIntent, flags))
+                                                .setAutoCancel(true)
+                                                .build()
+
+                                        notificationManager.notify(getNotificationID(data.getString("ProfileOnion"), channelId), newNotification)
                                     }
 
-                            val loader = FlutterInjector.instance().flutterLoader()
-                            val key = loader.getLookupKeyForAsset("assets/" + data.getString("Picture"))//"assets/profiles/001-centaur.png")
-                            val fh = applicationContext.assets.open(key)
-
-
-                            val clickIntent = Intent(applicationContext, MainActivity::class.java).also { intent ->
-                                intent.action = Intent.ACTION_RUN
-                                intent.putExtra("EventType", "NotificationClicked")
-                                intent.putExtra("ProfileOnion", data.getString("ProfileOnion"))
-                                intent.putExtra("Handle", handle)
+                                }
+                            } else if (evt.EventType == "FileDownloadProgressUpdate") {
+                                try {
+                                    val data = JSONObject(evt.Data);
+                                    val fileKey = data.getString("FileKey");
+                                    val title = data.getString("NameSuggestion");
+                                    val progress = data.getString("Progress").toInt();
+                                    val progressMax = data.getString("FileSizeInChunks").toInt();
+                                    if (!downloadIDs.containsKey(fileKey)) {
+                                        downloadIDs.put(fileKey, downloadIDs.count());
+                                    }
+                                    var dlID = downloadIDs.get(fileKey);
+                                    if (dlID == null) {
+                                        dlID = 0;
+                                    }
+                                    if (progress >= 0) {
+                                        val channelId =
+                                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                                                    createDownloadNotificationChannel(fileKey, fileKey)
+                                                } else {
+                                                    // If earlier version channel ID is not used
+                                                    // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
+                                                    ""
+                                                };
+                                        val newNotification = NotificationCompat.Builder(applicationContext, channelId)
+                                                .setOngoing(true)
+                                                .setContentTitle("Downloading")//todo: translate
+                                                .setContentText(title)
+                                                .setSmallIcon(android.R.drawable.stat_sys_download)
+                                                .setProgress(progressMax, progress, false)
+                                                .setSound(null)
+                                                //.setSilent(true)
+                                                .build();
+                                        notificationManager.notify(dlID, newNotification);
+                                    }
+                                } catch (e: Exception) {
+                                    Log.d("FlwtchWorker->FileDownloadProgressUpdate", e.toString() + " :: " + e.getStackTrace());
+                                }
+                            } else if (evt.EventType == "FileDownloaded") {
+                                Log.d(TAG, "file downloaded!");
+                                val data = JSONObject(evt.Data);
+                                val tempFile = data.getString("TempFile");
+                                val fileKey = data.getString("FileKey");
+                                if (tempFile != "" && tempFile != data.getString("FilePath")) {
+                                    val filePath = data.getString("FilePath");
+                                    Log.i(TAG, "moving " + tempFile + " to " + filePath);
+                                    val sourcePath = Paths.get(tempFile);
+                                    val targetUri = Uri.parse(filePath);
+                                    val os = this.applicationContext.getContentResolver().openOutputStream(targetUri);
+                                    val bytesWritten = Files.copy(sourcePath, os);
+                                    Log.d("TAG", "copied " + bytesWritten.toString() + " bytes");
+                                    if (bytesWritten != 0L) {
+                                        os?.flush();
+                                        os?.close();
+                                        Files.delete(sourcePath);
+                                    }
+                                }
+                                if (downloadIDs.containsKey(fileKey)) {
+                                    notificationManager.cancel(downloadIDs.get(fileKey) ?: 0);
+                                }
                             }
 
-                            val newNotification = NotificationCompat.Builder(applicationContext, channelId)
-                                    .setContentTitle(data.getString("Nick"))
-                                    .setContentText("New message")//todo: translate
-                                    .setLargeIcon(BitmapFactory.decodeStream(fh))
-                                    .setSmallIcon(R.mipmap.knott_transparent)
-                                    .setContentIntent(PendingIntent.getActivity(applicationContext, 1, clickIntent, PendingIntent.FLAG_UPDATE_CURRENT))
-                                    .setAutoCancel(true)
-                                    .build()
-                            notificationManager.notify(getNotificationID(data.getString("ProfileOnion"), handle), newNotification)
-                        }
-                    } else if (evt.EventType == "FileDownloadProgressUpdate") {
-                        try {
-                            val data = JSONObject(evt.Data);
-                            val fileKey = data.getString("FileKey");
-                            val title = data.getString("NameSuggestion");
-                            val progress = data.getString("Progress").toInt();
-                            val progressMax = data.getString("FileSizeInChunks").toInt();
-                            if (!downloadIDs.containsKey(fileKey)) {
-                                downloadIDs.put(fileKey, downloadIDs.count());
+                            Intent().also { intent ->
+                                intent.action = "im.cwtch.flwtch.broadcast.SERVICE_EVENT_BUS"
+                                intent.putExtra("EventType", evt.EventType)
+                                intent.putExtra("Data", evt.Data)
+                                intent.putExtra("EventID", evt.EventID)
+                                LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(intent)
                             }
-                            var dlID = downloadIDs.get(fileKey);
-                            if (dlID == null) {
-                                dlID = 0;
-                            }
-                            if (progress >= 0) {
-                                val channelId =
-                                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                                            createDownloadNotificationChannel(fileKey, fileKey)
-                                        } else {
-                                            // If earlier version channel ID is not used
-                                            // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
-                                            ""
-                                        };
-                                val newNotification = NotificationCompat.Builder(applicationContext, channelId)
-                                        .setOngoing(true)
-                                        .setContentTitle("Downloading")//todo: translate
-                                        .setContentText(title)
-                                        .setSmallIcon(android.R.drawable.stat_sys_download)
-                                        .setProgress(progressMax, progress, false)
-                                        .setSound(null)
-                                        //.setSilent(true)
-                                        .build();
-                                notificationManager.notify(dlID, newNotification);
+                            if (evt.EventType == "Shutdown") {
+                                Log.i(TAG, "processing shutdown event, exiting FlwtchWorker/Start()...");
+                                return Result.success()
                             }
                         } catch (e: Exception) {
-                            Log.d("FlwtchWorker->FileDownloadProgressUpdate", e.toString() + " :: " + e.getStackTrace());
-                        }
-                    } else if (evt.EventType == "FileDownloaded") {
-                        Log.d("FlwtchWorker", "file downloaded!");
-                        val data = JSONObject(evt.Data);
-                        val tempFile = data.getString("TempFile");
-                        val fileKey = data.getString("FileKey");
-                        if (tempFile != "" && tempFile != data.getString("FilePath")) {
-                            val filePath = data.getString("FilePath");
-                            Log.i("FlwtchWorker", "moving "+tempFile+" to "+filePath);
-                            val sourcePath = Paths.get(tempFile);
-                            val targetUri = Uri.parse(filePath);
-                            val os = this.applicationContext.getContentResolver().openOutputStream(targetUri);
-                            val bytesWritten = Files.copy(sourcePath, os);
-                            Log.d("FlwtchWorker", "copied " + bytesWritten.toString() + " bytes");
-                            if (bytesWritten != 0L) {
-                                os?.flush();
-                                os?.close();
-                                Files.delete(sourcePath);
-                            }
-                        }
-                        if (downloadIDs.containsKey(fileKey)) {
-                            notificationManager.cancel(downloadIDs.get(fileKey)?:0);
+                            Log.e(TAG, "Error in handleCwtch: " + e.toString() + " :: " + e.getStackTrace());
                         }
                     }
-
-                    Intent().also { intent ->
-                        intent.action = "im.cwtch.flwtch.broadcast.SERVICE_EVENT_BUS"
-                        intent.putExtra("EventType", evt.EventType)
-                        intent.putExtra("Data", evt.Data)
-                        intent.putExtra("EventID", evt.EventID)
-                        LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(intent)
-                    }
+                }
+                // Event passing translations from Flutter to Kotlin worker scope so the worker can use them
+                "L10nInit" -> {
+                    notificationSimple = (a.get("notificationSimple") as? String) ?: "New Message"
+                    notificationConversationInfo = (a.get("notificationConversationInfo") as? String)
+                            ?: "New Message From "
+                }
+                else -> {
+                    Log.i(TAG, "unknown command: " + method);
+                    return Result.failure()
                 }
             }
-            "ReconnectCwtchForeground" -> {
-                Cwtch.reconnectCwtchForeground()
-            }
-            "CreateProfile" -> {
-                val nick = (a.get("nick") as? String) ?: ""
-                val pass = (a.get("pass") as? String) ?: ""
-                Cwtch.createProfile(nick, pass)
-            }
-            "LoadProfiles" -> {
-                val pass = (a.get("pass") as? String) ?: ""
-                Cwtch.loadProfiles(pass)
-            }
-            "ChangePassword" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val pass = (a.get("OldPass") as? String) ?: ""
-                val passNew = (a.get("NewPass") as? String) ?: ""
-                val passNew2 = (a.get("NewPassAgain") as? String) ?: ""
-                Cwtch.changePassword(profile, pass, passNew, passNew2)
-            }
-            "GetMessage" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val indexI = a.getInt("index").toLong()
-                Log.d("FlwtchWorker", "Cwtch GetMessage " + profile + " " + conversation.toString() + " " + indexI.toString())
-                return Result.success(Data.Builder().putString("result", Cwtch.getMessage(profile, conversation, indexI)).build())
-            }
-            "GetMessageByID" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val id = a.getInt("id").toLong()
-                return Result.success(Data.Builder().putString("result", Cwtch.getMessageByID(profile, conversation, id)).build())
-            }
-            "GetMessageByContentHash" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val contentHash = (a.get("contentHash") as? String) ?: ""
-                return Result.success(Data.Builder().putString("result", Cwtch.getMessagesByContentHash(profile, conversation, contentHash)).build())
-            }
-            "UpdateMessageAttribute" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val channel = a.getInt("chanenl").toLong()
-                val midx = a.getInt("midx").toLong()
-                val key = (a.get("key") as? String) ?: ""
-                val value = (a.get("value") as? String) ?: ""
-                Cwtch.setMessageAttribute(profile, conversation, channel, midx, key, value)
-            }
-            "AcceptConversation" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                Cwtch.acceptConversation(profile, conversation)
-            }
-            "BlockContact" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                Cwtch.blockContact(profile, conversation)
-            }
-            "UnblockContact" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                Cwtch.unblockContact(profile, conversation)
-            }
-            "SendMessage" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val message = (a.get("message") as? String) ?: ""
-                Cwtch.sendMessage(profile, conversation, message)
-            }
-            "SendInvitation" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val target = a.getInt("target").toLong()
-                Cwtch.sendInvitation(profile, conversation, target)
-            }
-            "ShareFile" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val filepath = (a.get("filepath") as? String) ?: ""
-                Cwtch.shareFile(profile, conversation, filepath)
-            }
-            "DownloadFile" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val filepath = (a.get("filepath") as? String) ?: ""
-                val manifestpath = (a.get("manifestpath") as? String) ?: ""
-                val filekey = (a.get("filekey") as? String) ?: ""
-                // FIXME: Prevent spurious calls by Intent
-                if (profile != "") {
-                    Cwtch.downloadFile(profile, conversation, filepath, manifestpath, filekey)
-                }
-            }
-            "CheckDownloadStatus" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val fileKey = (a.get("fileKey") as? String) ?: ""
-                Cwtch.checkDownloadStatus(profile, fileKey)
-            }
-            "VerifyOrResumeDownload" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val fileKey = (a.get("fileKey") as? String) ?: ""
-                Cwtch.verifyOrResumeDownload(profile, conversation, fileKey)
-            }
-            "SendProfileEvent" -> {
-                val onion = (a.get("onion") as? String) ?: ""
-                val jsonEvent = (a.get("jsonEvent") as? String) ?: ""
-                Cwtch.sendProfileEvent(onion, jsonEvent)
-            }
-            "SendAppEvent" -> {
-                val jsonEvent = (a.get("jsonEvent") as? String) ?: ""
-                Cwtch.sendAppEvent(jsonEvent)
-            }
-            "ResetTor" -> {
-                Cwtch.resetTor()
-            }
-            "ImportBundle" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val bundle = (a.get("bundle") as? String) ?: ""
-                Cwtch.importBundle(profile, bundle)
-            }
-            "CreateGroup" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val server = (a.get("server") as? String) ?: ""
-                val groupName = (a.get("groupName") as? String) ?: ""
-                Cwtch.createGroup(profile, server, groupName)
-            }
-            "DeleteProfile" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val pass = (a.get("pass") as? String) ?: ""
-                Cwtch.deleteProfile(profile, pass)
-            }
-            "ArchiveConversation" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                Cwtch.archiveConversation(profile, conversation)
-            }
-            "DeleteConversation" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                Cwtch.deleteContact(profile, conversation)
-            }
-            "SetProfileAttribute" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val key = (a.get("Key") as? String) ?: ""
-                val v = (a.get("Val") as? String) ?: ""
-                Cwtch.setProfileAttribute(profile, key, v)
-            }
-            "SetConversationAttribute" -> {
-                val profile = (a.get("ProfileOnion") as? String) ?: ""
-                val conversation = a.getInt("conversation").toLong()
-                val key = (a.get("Key") as? String) ?: ""
-                val v = (a.get("Val") as? String) ?: ""
-                Cwtch.setConversationAttribute(profile, conversation, key, v)
-            }
-            "Shutdown" -> {
-                Cwtch.shutdownCwtch();
-                return Result.success()
-            }
-            "LoadServers" -> {
-                val password = (a.get("Password") as? String) ?: ""
-                Cwtch.loadServers(password)
-            }
-            "CreateServer" -> {
-                val password = (a.get("Password") as? String) ?: ""
-                val desc = (a.get("Description") as? String) ?: ""
-                val autostart = (a.get("Autostart") as? Boolean) ?: false
-                Cwtch.createServer(password, desc, autostart)
-            }
-            "DeleteServer" -> {
-                val serverOnion = (a.get("ServerOnion") as? String) ?: ""
-                val password = (a.get("Password") as? String) ?: ""
-                Cwtch.deleteServer(serverOnion, password)
-            }
-            "LaunchServers" -> {
-                Cwtch.launchServers()
-            }
-            "LaunchServer" -> {
-                val serverOnion = (a.get("ServerOnion") as? String) ?: ""
-                Cwtch.launchServer(serverOnion)
-            }
-            "StopServer" -> {
-                val serverOnion = (a.get("ServerOnion") as? String) ?: ""
-                Cwtch.stopServer(serverOnion)
-            }
-            "StopServers" -> {
-                Cwtch.stopServers()
-            }
-            "DestroyServers" -> {
-                Cwtch.destroyServers()
-            }
-            "SetServerAttribute" -> {
-                val serverOnion = (a.get("ServerOnion") as? String) ?: ""
-                val key = (a.get("Key") as? String) ?: ""
-                val v = (a.get("Val") as? String) ?: ""
-                Cwtch.setServerAttribute(serverOnion, key, v)
-            }
-            else -> {
-                Log.i("FlwtchWorker", "unknown command: " + method);
-                return Result.failure()
-            }
-        }
-        return Result.success()
+            return Result.success()
     }
 
     // Creates an instance of ForegroundInfo which can be used to update the
     // ongoing notification.
     private fun createForegroundInfo(progress: String): ForegroundInfo {
         val id = "flwtch"
-        val title = "Flwtch"
-        val cancel = "Shut down"//todo: translate
+        val title = "Flwtch" // TODO: change
+        val cancel = "Shut down" // TODO: translate
         val channelId =
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     createForegroundNotificationChannel(id, id)
@@ -390,6 +270,10 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
             intent.action = Intent.ACTION_RUN
             intent.putExtra("EventType", "ShutdownClicked")
         }
+        var flags = PendingIntent.FLAG_UPDATE_CURRENT
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            flags = flags or PendingIntent.FLAG_IMMUTABLE
+        }
 
         val notification = NotificationCompat.Builder(applicationContext, channelId)
                 .setContentTitle(title)
@@ -399,7 +283,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                 .setOngoing(true)
                 // Add the cancel action to the notification which can
                 // be used to cancel the worker
-                .addAction(android.R.drawable.ic_delete, cancel, PendingIntent.getActivity(applicationContext, 2, cancelIntent, PendingIntent.FLAG_UPDATE_CURRENT))
+                .addAction(android.R.drawable.ic_delete, cancel, PendingIntent.getActivity(applicationContext, 2, cancelIntent, flags))
                 .build()
 
         return ForegroundInfo(101, notification)

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

@@ -1,46 +1,48 @@
 package im.cwtch.flwtch
 
 import SplashView
+import android.annotation.TargetApi
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import androidx.annotation.NonNull
 import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.PowerManager
+import android.provider.Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
 import android.util.Log
 import android.view.Window
+import android.view.WindowManager
+import androidx.annotation.NonNull
 import androidx.lifecycle.Observer
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.work.*
-import io.flutter.embedding.android.SplashScreen
+import cwtch.Cwtch
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.SplashScreen
 import io.flutter.embedding.engine.FlutterEngine
-import io.flutter.plugin.common.MethodChannel
-import io.flutter.plugin.common.MethodCall
-import io.flutter.plugin.common.MethodChannel.Result
 import io.flutter.plugin.common.ErrorLogResult
-
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugin.common.MethodChannel.Result
 import org.json.JSONObject
-import java.util.concurrent.TimeUnit
-import java.io.File
 import java.nio.file.Files
 import java.nio.file.Paths
-import java.nio.file.StandardCopyOption
+import java.util.concurrent.TimeUnit
 
-import android.net.Uri
-import android.provider.DocumentsContract
-import android.content.ContentUris
-import android.os.Build
-import android.os.Environment
-import android.database.Cursor
-import android.provider.MediaStore
 
 class MainActivity: FlutterActivity() {
     override fun provideSplashScreen(): SplashScreen? = SplashView()
 
+
     // Channel to get app info
     private val CHANNEL_APP_INFO = "test.flutter.dev/applicationInfo"
     private val CALL_APP_INFO = "getNativeLibDir"
+    private val ANDROID_SETTINGS_CHANNEL_NAME = "androidSettings"
+    private val ANDROID_SETTINGS_CHANGE_NAME= "androidSettingsChanged"
+    private var andoidSettingsChangeChannel: MethodChannel? = null
+    private val CALL_ASK_BATTERY_EXEMPTION = "requestBatteryExemption"
+    private val CALL_IS_BATTERY_EXEMPT = "isBatteryExempt"
 
     // Channel to get cwtch api calls on
     private val CHANNEL_CWTCH = "cwtch"
@@ -52,6 +54,7 @@ class MainActivity: FlutterActivity() {
     private val CHANNEL_NOTIF_CLICK = "im.cwtch.flwtch/notificationClickHandler"
     private val CHANNEL_SHUTDOWN_CLICK = "im.cwtch.flwtch/shutdownClickHandler"
 
+    private val TAG: String = "MainActivity.kt"
     // WorkManager tag applied to all Start() infinite coroutines
     val WORKER_TAG = "cwtchEventBusWorker"
 
@@ -62,11 +65,27 @@ class MainActivity: FlutterActivity() {
     // "Download to..." prompt extra arguments
     private val FILEPICKER_REQUEST_CODE = 234
     private val PREVIEW_EXPORT_REQUEST_CODE = 235
+    private val PROFILE_EXPORT_REQUEST_CODE = 236
+    private val REQUEST_DOZE_WHITELISTING_CODE:Int = 9
     private var dlToProfile = ""
-    private var dlToHandle = ""
+    private var dlToHandle = 0
     private var dlToFileKey = ""
     private var exportFromPath = ""
 
+    override fun onCreate(savedInstanceState: android.os.Bundle?) {
+        super.onCreate(savedInstanceState)
+        window.setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE)
+        // Todo: when we support SDK 31
+        // hideOverlay()
+    }
+
+    /*
+    @TargetApi(31)
+    fun hideOverlay() {
+        window.setHideOverlayWindows(true);
+    }
+    */
+
     // handles clicks received from outside the app (ie, notifications)
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
@@ -93,34 +112,61 @@ class MainActivity: FlutterActivity() {
     override fun onActivityResult(requestCode: Int, result: Int, intent: Intent?) {
         super.onActivityResult(requestCode, result, intent);
 
+        // has null intent and data
+        if (requestCode == REQUEST_DOZE_WHITELISTING_CODE) {
+            // 0 == "battery optimized" (still)
+            // -1 == "no battery optimization" (exempt!)
+            andoidSettingsChangeChannel!!.invokeMethod("powerExemptionChange", result == -1)
+            return;
+        }
+
         if (intent == null || intent!!.getData() == null) {
-            Log.i("MainActivity:onActivityResult", "user canceled activity");
+            Log.i(TAG, "user canceled activity");
             return;
         }
 
         if (requestCode == FILEPICKER_REQUEST_CODE) {
             val filePath = intent!!.getData().toString();
             val manifestPath = StringBuilder().append(this.applicationContext.cacheDir).append("/").append(this.dlToFileKey).toString();
+            Log.d("MainActivity:FILEPICKER_REQUEST_CODE", "DownloadableFileCreated");
             handleCwtch(MethodCall("DownloadFile", mapOf(
                     "ProfileOnion" to this.dlToProfile,
-                    "handle" to this.dlToHandle,
+                    "conversation" to this.dlToHandle.toInt(),
                     "filepath" to filePath,
                     "manifestpath" to manifestPath,
                     "filekey" to this.dlToFileKey
             )), ErrorLogResult(""));//placeholder; this Result is never actually invoked
         } else if (requestCode == PREVIEW_EXPORT_REQUEST_CODE) {
-            val targetPath = intent!!.getData().toString()
-            var srcFile = File(this.exportFromPath)
-            Log.i("MainActivity:PREVIEW_EXPORT", "exporting previewed file")
-            val sourcePath = Paths.get(this.exportFromPath);
-            val targetUri = Uri.parse(targetPath);
-            val os = this.applicationContext.getContentResolver().openOutputStream(targetUri);
-            val bytesWritten = Files.copy(sourcePath, os);
-            Log.d("MainActivity:PREVIEW_EXPORT", "copied " + bytesWritten.toString() + " bytes");
-            if (bytesWritten != 0L) {
-                os?.flush();
-                os?.close();
-                //Files.delete(sourcePath);
+            try {
+                val sourcePath = Paths.get(this.exportFromPath);
+                val targetUri = intent!!.getData();
+                val os = this.applicationContext.getContentResolver().openOutputStream(targetUri!!);
+                val bytesWritten = Files.copy(sourcePath, os);
+                Log.d("MainActivity:PREVIEW_EXPORT", "copied " + bytesWritten.toString() + " bytes");
+                if (bytesWritten != 0L) {
+                    os?.flush();
+                    os?.close();
+                    //Files.delete(sourcePath);
+                }
+            } catch (e: Exception) {
+                Log.d("MainActivity:PREVIEW_EXPORT FAILED", e.toString());
+            }
+        } else if (requestCode == PROFILE_EXPORT_REQUEST_CODE ) {
+            val srcFile = StringBuilder().append(this.applicationContext.cacheDir).append("/").append(this.exportFromPath).toString();
+            Log.i("MainActivity:EXPORT_PROFILE", "exporting profile: " + srcFile);
+            try {
+                val sourcePath = Paths.get(srcFile);
+                val targetUri = intent!!.getData();
+                val os = this.applicationContext.getContentResolver().openOutputStream(targetUri!!);
+                val bytesWritten = Files.copy(sourcePath, os);
+                Log.d("MainActivity:EXPORT_PROFILE", "copied " + bytesWritten.toString() + " bytes");
+                if (bytesWritten != 0L) {
+                    os?.flush();
+                    os?.close();
+                    //Files.delete(sourcePath);
+                }
+            } catch (e: Exception) {
+                Log.d("MainActivity:EXPORT_PROFILE FAILED",  e.toString());
             }
         }
     }
@@ -132,10 +178,13 @@ class MainActivity: FlutterActivity() {
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL_APP_INFO).setMethodCallHandler { call, result -> handleAppInfo(call, result) }
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL_CWTCH).setMethodCallHandler { call, result -> handleCwtch(call, result) }
+        MethodChannel(flutterEngine.dartExecutor.binaryMessenger, ANDROID_SETTINGS_CHANNEL_NAME).setMethodCallHandler { call, result -> handleAndroidSettings(call, result) }
         notificationClickChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL_NOTIF_CLICK)
         shutdownClickChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL_SHUTDOWN_CLICK)
+        andoidSettingsChangeChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, ANDROID_SETTINGS_CHANGE_NAME)
     }
 
+    // MethodChannel CHANNEL_APP_INFO handler (Flutter Channel for requests for Android environment info)
     private fun handleAppInfo(@NonNull call: MethodCall, @NonNull result: Result) {
         when (call.method) {
             CALL_APP_INFO -> result.success(getNativeLibDir())
@@ -144,6 +193,30 @@ class MainActivity: FlutterActivity() {
         }
     }
 
+    // MethodChannel ANDROID_SETTINGS_CHANNEL_NAME handler (Flutter Channel for requests for Android settings)
+    // Called from lib/view/globalsettingsview.dart
+    private fun handleAndroidSettings(@NonNull call: MethodCall, @NonNull result: Result) {
+        when (call.method) {
+            CALL_IS_BATTERY_EXEMPT -> result.success(checkIgnoreBatteryOpt() ?: false);
+            CALL_ASK_BATTERY_EXEMPTION -> { requestBatteryExemption(); result.success(null); }
+            else -> result.notImplemented()
+        }
+    }
+
+    @TargetApi(23)
+    private fun checkIgnoreBatteryOpt(): Boolean {
+        val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
+        return powerManager.isIgnoringBatteryOptimizations(this.packageName) ?: false;
+    }
+
+    @TargetApi(23)
+    private fun requestBatteryExemption() {
+        val i = Intent()
+        i.action = ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+        i.data = Uri.parse("package:" + this.packageName)
+        startActivityForResult(i, REQUEST_DOZE_WHITELISTING_CODE);
+    }
+
     private fun getNativeLibDir(): String {
         val ainfo = this.applicationContext.packageManager.getApplicationInfo(
                 "im.cwtch.flwtch", // Must be app name
@@ -154,76 +227,346 @@ class MainActivity: FlutterActivity() {
     // receives messages from the ForegroundService (which provides, ironically enough, the backend)
     private fun handleCwtch(@NonNull call: MethodCall, @NonNull result: Result) {
         var method = call.method
-        val argmap: Map<String, String> = call.arguments as Map<String, String>
+        // todo change usage patern to match that in FlwtchWorker
+        // Unsafe for anything using int args, causes access time attempt to cast to string which will fail
+        val argmap: Map<String, String> = call.arguments as Map<String,String>
 
         // the frontend calls Start every time it fires up, but we don't want to *actually* call Cwtch.Start()
         // in case the ForegroundService is still running. in both cases, however, we *do* want to re-register
         // the eventbus listener.
-        if (call.method == "Start") {
-            val uniqueTag = argmap["torPath"] ?: "nullEventBus"
+        when (call.method) {
+            "Start" -> {
+                val uniqueTag = argmap["torPath"] ?: "nullEventBus"
 
-            // note: because the ForegroundService is specified as UniquePeriodicWork, it can't actually get
-            // accidentally duplicated. however, we still need to manually check if it's running or not, so
-            // that we can divert this method call to ReconnectCwtchForeground instead if so.
-            val works = WorkManager.getInstance(this).getWorkInfosByTag(WORKER_TAG).get()
-            for (workInfo in works) {
-                WorkManager.getInstance(this).cancelWorkById(workInfo.id)
-            }
-            WorkManager.getInstance(this).pruneWork()
+                // note: because the ForegroundService is specified as UniquePeriodicWork, it can't actually get
+                // accidentally duplicated. however, we still need to manually check if it's running or not, so
+                // that we can divert this method call to ReconnectCwtchForeground instead if so.
+                val works = WorkManager.getInstance(this).getWorkInfosByTag(WORKER_TAG).get()
+                for (workInfo in works) {
+                    WorkManager.getInstance(this).cancelWorkById(workInfo.id)
+                }
+                WorkManager.getInstance(this).pruneWork()
 
-            Log.i("MainActivity.kt", "Start() launching foregroundservice")
-            // this is where the eventbus ForegroundService gets launched. WorkManager should keep it alive after this
-            val data: Data = Data.Builder().putString(FlwtchWorker.KEY_METHOD, call.method).putString(FlwtchWorker.KEY_ARGS, JSONObject(argmap).toString()).build()
-            // 15 minutes is the shortest interval you can request
-            val workRequest = PeriodicWorkRequestBuilder<FlwtchWorker>(15, TimeUnit.MINUTES).setInputData(data).addTag(WORKER_TAG).addTag(uniqueTag).build()
-            WorkManager.getInstance(this).enqueueUniquePeriodicWork("req_$uniqueTag", ExistingPeriodicWorkPolicy.REPLACE, workRequest)
-            return
-        } else if (call.method == "CreateDownloadableFile") {
-            this.dlToProfile = argmap["ProfileOnion"] ?: ""
-            this.dlToHandle = argmap["handle"] ?: ""
-            val suggestedName = argmap["filename"] ?: "filename.ext"
-            this.dlToFileKey = argmap["filekey"] ?: ""
-            val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                type = "application/octet-stream"
-                putExtra(Intent.EXTRA_TITLE, suggestedName)
+                Log.i("MainActivity.kt", "Start() launching foregroundservice")
+                // this is where the eventbus ForegroundService gets launched. WorkManager should keep it alive after this
+                val data: Data = Data.Builder().putString(FlwtchWorker.KEY_METHOD, call.method).putString(FlwtchWorker.KEY_ARGS, JSONObject(argmap).toString()).build()
+                // 15 minutes is the shortest interval you can request
+                val workRequest = PeriodicWorkRequestBuilder<FlwtchWorker>(15, TimeUnit.MINUTES).setInputData(data).addTag(WORKER_TAG).addTag(uniqueTag).build()
+                WorkManager.getInstance(this).enqueueUniquePeriodicWork("req_$uniqueTag", ExistingPeriodicWorkPolicy.REPLACE, workRequest)
             }
-            startActivityForResult(intent, FILEPICKER_REQUEST_CODE)
-            return
-        } else if (call.method == "ExportPreviewedFile") {
-            this.exportFromPath = argmap["Path"] ?: ""
-            val suggestion = argmap["FileName"] ?: "filename.ext"
-            var imgType = "jpeg"
-            if (suggestion.endsWith("png")) {
-                imgType = "png"
-            } else if (suggestion.endsWith("webp")) {
-                imgType = "webp"
-            } else if (suggestion.endsWith("bmp")) {
-                imgType = "bmp"
-            } else if (suggestion.endsWith("gif")) {
-                imgType = "gif"
+            "CreateDownloadableFile" -> {
+                this.dlToProfile = argmap["ProfileOnion"] ?: ""
+                this.dlToHandle =  call.argument("conversation")!!
+                val suggestedName = argmap["filename"] ?: "filename.ext"
+                this.dlToFileKey = argmap["filekey"] ?: ""
+                val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+                    addCategory(Intent.CATEGORY_OPENABLE)
+                    type = "application/octet-stream"
+                    putExtra(Intent.EXTRA_TITLE, suggestedName)
+                }
+                startActivityForResult(intent, FILEPICKER_REQUEST_CODE)
             }
-            val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
-                addCategory(Intent.CATEGORY_OPENABLE)
-                type = "image/" + imgType
-                putExtra(Intent.EXTRA_TITLE, suggestion)
+            "ExportPreviewedFile" -> {
+                this.exportFromPath = argmap["Path"] ?: ""
+                val suggestion = argmap["FileName"] ?: "filename.ext"
+                var imgType = "jpeg"
+                if (suggestion.endsWith("png")) {
+                    imgType = "png"
+                } else if (suggestion.endsWith("webp")) {
+                    imgType = "webp"
+                } else if (suggestion.endsWith("bmp")) {
+                    imgType = "bmp"
+                } else if (suggestion.endsWith("gif")) {
+                    imgType = "gif"
+                }
+                val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+                    addCategory(Intent.CATEGORY_OPENABLE)
+                    type = "image/" + imgType
+                    putExtra(Intent.EXTRA_TITLE, suggestion)
+                }
+                startActivityForResult(intent, PREVIEW_EXPORT_REQUEST_CODE)
             }
-            startActivityForResult(intent, PREVIEW_EXPORT_REQUEST_CODE)
-            return
-        }
+            "ExportProfile" -> {
 
-        // ...otherwise fallthru to a normal ffi method call (and return the result using the result callback)
-        val data: Data = Data.Builder().putString(FlwtchWorker.KEY_METHOD, method).putString(FlwtchWorker.KEY_ARGS, JSONObject(argmap).toString()).build()
-        val workRequest = OneTimeWorkRequestBuilder<FlwtchWorker>().setInputData(data).build()
-        WorkManager.getInstance(this).enqueue(workRequest)
-        WorkManager.getInstance(applicationContext).getWorkInfoByIdLiveData(workRequest.id).observe(
-            this, Observer { workInfo ->
-                if (workInfo.state == WorkInfo.State.SUCCEEDED) {
-                    val res = workInfo.outputData.keyValueMap.toString()
-                    result.success(workInfo.outputData.getString("result"))
+                val profileOnion: String = call.argument("ProfileOnion") ?: ""
+                val file: String = StringBuilder().append(this.applicationContext.cacheDir).append("/").append(call.argument("file") ?: "").toString()
+                Log.i("FlwtchWorker", "constructing exported file " + file);
+                Cwtch.exportProfile(profileOnion,file)
+
+                this.exportFromPath = argmap["file"] ?: ""
+                val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+                    addCategory(Intent.CATEGORY_OPENABLE)
+                    type = "application/gzip"
+                    putExtra(Intent.EXTRA_TITLE, argmap["file"])
+                }
+                startActivityForResult(intent, PROFILE_EXPORT_REQUEST_CODE)
+            }
+            "GetMessages" -> {
+                Log.d("MainActivity.kt", "Cwtch GetMessages")
+
+                val profile = argmap["ProfileOnion"] ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val indexI: Int = call.argument("index") ?: 0
+                val count: Int = call.argument("count") ?: 1
+
+                result.success(Cwtch.getMessages(profile, conversation.toLong(), indexI.toLong(), count.toLong()))
+                return
+            }
+            "SendMessage" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val message: String = call.argument("message") ?: ""
+                result.success(Cwtch.sendMessage(profile, conversation.toLong(), message))
+                return
+            }
+            "SendInvitation" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val target: Int = call.argument("target") ?: 0
+                result.success(Cwtch.sendInvitation(profile, conversation.toLong(), target.toLong()))
+                return
+            }
+
+            "ShareFile" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val filepath: String = call.argument("filepath") ?: ""
+                result.success(Cwtch.shareFile(profile, conversation.toLong(), filepath))
+                return
+            }
+
+            "GetSharedFiles" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                result.success(Cwtch.getSharedFiles(profile, conversation.toLong()))
+                return
+            }
+
+            "RestartSharing" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val filepath: String = call.argument("filekey") ?: ""
+                result.success(Cwtch.restartSharing(profile, filepath))
+                return
+            }
+
+            "StopSharing" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val filepath: String = call.argument("filekey") ?: ""
+                result.success(Cwtch.stopSharing(profile, filepath))
+                return
+            }
+
+            "CreateProfile" -> {
+                val nick: String = call.argument("nick") ?: ""
+                val pass: String = call.argument("pass") ?: ""
+                val autostart: Boolean = call.argument("autostart") ?: true
+                Cwtch.createProfile(nick, pass, autostart)
+            }
+            "LoadProfiles" -> {
+                val pass: String = call.argument("pass") ?: ""
+                Cwtch.loadProfiles(pass)
+            }
+            "ActivatePeerEngine" -> {
+                val profile: String = call.argument("profile") ?: ""
+                Cwtch.activatePeerEngine(profile)
+            }
+            "DeactivatePeerEngine" -> {
+                val profile: String = call.argument("profile") ?: ""
+                Cwtch.deactivatePeerEngine(profile)
+            }
+            "ChangePassword" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val pass: String = call.argument("OldPass") ?: ""
+                val passNew: String = call.argument("NewPass") ?: ""
+                val passNew2: String = call.argument("NewPassAgain") ?: ""
+                Cwtch.changePassword(profile, pass, passNew, passNew2)
+            }
+            "GetMessage" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val indexI: Int = call.argument("index") ?: 0
+                result.success(Cwtch.getMessage(profile, conversation.toLong(), indexI.toLong()))
+                return
+            }
+            "GetMessageByID" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val id: Int = call.argument("id") ?: 0
+                result.success(Cwtch.getMessageByID(profile, conversation.toLong(), id.toLong()))
+                return
+            }
+            "GetMessageByContentHash" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val contentHash: String = call.argument("contentHash") ?: ""
+                result.success(Cwtch.getMessagesByContentHash(profile, conversation.toLong(), contentHash))
+                return
+            }
+            "SetMessageAttribute" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val channel: Int = call.argument("Chanenl") ?: 0
+                val midx: Int = call.argument("Message") ?: 0
+                val key: String = call.argument("key") ?: ""
+                val value: String = call.argument("value") ?: ""
+                Cwtch.setMessageAttribute(profile, conversation.toLong(), channel.toLong(), midx.toLong(), key, value)
+            }
+            "AcceptConversation" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                Cwtch.acceptConversation(profile, conversation.toLong())
+            }
+            "BlockContact" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                Cwtch.blockContact(profile, conversation.toLong())
+            }
+            "UnblockContact" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                Cwtch.unblockContact(profile, conversation.toLong())
+            }
+
+            "DownloadFile" -> {
+                Log.d("MainActivity.kt", "Cwtch Download File Called...")
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val filepath: String = call.argument("filepath") ?: ""
+                val manifestpath: String = call.argument("manifestpath") ?: ""
+                val filekey: String = call.argument("filekey") ?: ""
+                // FIXME: Prevent spurious calls by Intent
+                if (profile != "") {
+                    Cwtch.downloadFile(profile, conversation.toLong(), filepath, manifestpath, filekey)
                 }
             }
-        )
+            "CheckDownloadStatus" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val fileKey: String = call.argument("fileKey") ?: ""
+                Cwtch.checkDownloadStatus(profile, fileKey)
+            }
+            "VerifyOrResumeDownload" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val fileKey: String = call.argument("fileKey") ?: ""
+                Cwtch.verifyOrResumeDownload(profile, conversation.toLong(), fileKey)
+            }
+            "SendProfileEvent" -> {
+                val onion: String= call.argument("onion") ?: ""
+                val jsonEvent: String = call.argument("jsonEvent") ?: ""
+                Cwtch.sendProfileEvent(onion, jsonEvent)
+            }
+            "SendAppEvent" -> {
+                val jsonEvent: String = call.argument("jsonEvent") ?: ""
+                Cwtch.sendAppEvent(jsonEvent)
+            }
+            "ResetTor" -> {
+                Cwtch.resetTor()
+            }
+            "ImportBundle" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val bundle: String = call.argument("bundle") ?: ""
+                result.success(Cwtch.importBundle(profile, bundle))
+            }
+            "CreateGroup" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val server: String = call.argument("server") ?: ""
+                val groupName: String = call.argument("groupName") ?: ""
+                Cwtch.createGroup(profile, server, groupName)
+            }
+            "DeleteProfile" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val pass: String = call.argument("pass") ?: ""
+                Cwtch.deleteProfile(profile, pass)
+            }
+            "ArchiveConversation" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                Cwtch.archiveConversation(profile, conversation.toLong())
+            }
+            "DeleteConversation" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                Cwtch.deleteContact(profile, conversation.toLong())
+            }
+            "SetProfileAttribute" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val key: String = call.argument("Key") ?: ""
+                val v: String = call.argument("Val") ?: ""
+                Cwtch.setProfileAttribute(profile, key, v)
+            }
+            "SetConversationAttribute" -> {
+                val profile: String = call.argument("ProfileOnion") ?: ""
+                val conversation: Int = call.argument("conversation") ?: 0
+                val key: String = call.argument("Key") ?: ""
+                val v: String = call.argument("Val") ?: ""
+                Cwtch.setConversationAttribute(profile, conversation.toLong(), key, v)
+            }
+            "LoadServers" -> {
+                val password: String = call.argument("Password") ?: ""
+                Cwtch.loadServers(password)
+            }
+            "CreateServer" -> {
+                val password: String = call.argument("Password") ?: ""
+                val desc: String = call.argument("Description") ?: ""
+                val autostart: Boolean = call.argument("Autostart") ?: false
+                Cwtch.createServer(password, desc, autostart)
+            }
+            "DeleteServer" -> {
+                val serverOnion: String = call.argument("ServerOnion") ?: ""
+                val password: String = call.argument("Password") ?: ""
+                Cwtch.deleteServer(serverOnion, password)
+            }
+            "LaunchServers" -> {
+                Cwtch.launchServers()
+            }
+            "LaunchServer" -> {
+                val serverOnion: String = call.argument("ServerOnion") ?: ""
+                Cwtch.launchServer(serverOnion)
+            }
+            "StopServer" -> {
+                val serverOnion: String = call.argument("ServerOnion") ?: ""
+                Cwtch.stopServer(serverOnion)
+            }
+            "StopServers" -> {
+                Cwtch.stopServers()
+            }
+            "DestroyServers" -> {
+                Cwtch.destroyServers()
+            }
+            "SetServerAttribute" -> {
+                val serverOnion: String = call.argument("ServerOnion") ?: ""
+                val key: String = call.argument("Key") ?: ""
+                val v: String = call.argument("Val") ?: ""
+                Cwtch.setServerAttribute(serverOnion, key, v)
+            }
+            "ImportProfile" -> {
+                val file: String = call.argument("file") ?: ""
+                val pass: String = call.argument("pass") ?: ""
+                Data.Builder().putString("result", Cwtch.importProfile(file, pass)).build()
+            }
+            "ReconnectCwtchForeground" -> {
+                Cwtch.reconnectCwtchForeground()
+            }
+            "Shutdown" -> {
+                Cwtch.shutdownCwtch();
+            }
+            else -> {
+                // ...otherwise fallthru to a normal ffi method call (and return the result using the result callback)
+                val data: Data = Data.Builder().putString(FlwtchWorker.KEY_METHOD, method).putString(FlwtchWorker.KEY_ARGS, JSONObject(argmap).toString()).build()
+                val workRequest = OneTimeWorkRequestBuilder<FlwtchWorker>().setInputData(data).build()
+                WorkManager.getInstance(this).enqueue(workRequest)
+                WorkManager.getInstance(applicationContext).getWorkInfoByIdLiveData(workRequest.id).observe(
+                        this, Observer { workInfo ->
+                            if (workInfo != null && workInfo.state == WorkInfo.State.SUCCEEDED) {
+                                val res = workInfo.outputData.keyValueMap.toString()
+                                result.success(workInfo.outputData.getString("result"))
+                            }
+                    }
+                )
+                return
+            }
+        }
+        result.success(null)
     }
 
     // using onresume/onstop for broadcastreceiver because of extended discussion on https://stackoverflow.com/questions/7439041/how-to-unregister-broadcastreceiver
@@ -232,19 +575,22 @@ class MainActivity: FlutterActivity() {
         Log.i("MainActivity.kt", "onResume")
         if (myReceiver == null) {
             Log.i("MainActivity.kt", "onResume registering local broadcast receiver / event bus forwarder")
-            val mc = MethodChannel(flutterEngine?.dartExecutor?.binaryMessenger, CWTCH_EVENTBUS)
-            val filter = IntentFilter("im.cwtch.flwtch.broadcast.SERVICE_EVENT_BUS")
-            myReceiver = MyBroadcastReceiver(mc)
-            LocalBroadcastManager.getInstance(applicationContext).registerReceiver(myReceiver!!, filter)
+            val bm = flutterEngine?.dartExecutor?.binaryMessenger;
+            if (bm != null) {
+                val mc = MethodChannel(bm, CWTCH_EVENTBUS)
+
+                val filter = IntentFilter("im.cwtch.flwtch.broadcast.SERVICE_EVENT_BUS")
+                myReceiver = MyBroadcastReceiver(mc)
+                LocalBroadcastManager.getInstance(applicationContext)
+                    .registerReceiver(myReceiver!!, filter)
+            }
         }
 
         // ReconnectCwtchForeground which will resync counters and settings...
         // We need to do this here because after a "pause" flutter is still running
         // but we might have lost sync with the background process...
         Log.i("MainActivity.kt", "Call ReconnectCwtchForeground")
-        val data: Data = Data.Builder().putString(FlwtchWorker.KEY_METHOD, "ReconnectCwtchForeground").putString(FlwtchWorker.KEY_ARGS, "{}").build()
-        val workRequest = OneTimeWorkRequestBuilder<FlwtchWorker>().setInputData(data).build()
-        WorkManager.getInstance(applicationContext).enqueue(workRequest)
+        Cwtch.reconnectCwtchForeground()
     }
 
     override fun onStop() {
@@ -256,6 +602,7 @@ class MainActivity: FlutterActivity() {
         }
     }
 
+
     override fun onDestroy() {
         super.onDestroy()
         Log.i("MainActivity.kt", "onDestroy - cancelling all WORKER_TAG and pruning old work")

android/app/src/main/res/layout/splash_view.xml

@@ -13,6 +13,7 @@
         app:lottie_autoPlay="true"
         app:lottie_rawRes="@raw/cwtch_animated_logo_op"
         app:lottie_loop="true"
-        app:lottie_speed="1.00" />
+        app:lottie_speed="1.00"
+        app:lottie_enableMergePathsForKitKatAndAbove="true" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

android/build.gradle

@@ -1,12 +1,13 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.5.31'
     repositories {
         google()
-        jcenter()
+        // jCenter() no longer exists... https://blog.gradle.org/jcenter-shutdown
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
     }
@@ -15,7 +16,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Mon Jun 20 10:33:21 PDT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+zipStoreBase=GRADLE_USER_HOME

build.yaml

@@ -0,0 +1,8 @@
+targets:
+  $default:
+    sources:
+      - lib/**
+      - pubspec.*
+      - $package$
+      # Allows the code generator to target files outside of the lib folder
+      - integration_test/**.dart

fastlane/metadata/android/en-US/long_description.txt

@@ -0,0 +1,16 @@
+Cwtch (/kʊtʃ/ - a Welsh word roughly translating to “a hug that creates a safe place”) is a decentralized,
+ privacy-preserving, multi-party messaging protocol that can be used to build metadata resistant applications.
+
+- Decentralized and Open: There is no “Cwtch service” or “Cwtch network”. Participants in Cwtch
+can host their own safe spaces, or lend their infrastructure to others seeking a safe space.
+The Cwtch protocol is open, and anyone is free to build bots, services and user interfaces and
+integrate and interact with Cwtch.
+
+- Privacy Preserving: All communication in Cwtch is end-to-end encrypted and takes place over Tor v3
+onion services.
+
+ - Metadata Resistant: Cwtch has been designed such that no information is exchanged or available to
+anyone without their explicit consent, including on-the-wire messages and protocol metadata.
+
+For more information on how Cwtch works and a guide to metadata resistant communication please
+checkout the Cwtch Handbook: https://docs.cwtch.im/

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+Metadata resistant privacy platform designed to help you resist surveillance

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+Cwtch

fastlane/metadata/android/en-US/video.txt

@@ -0,0 +1 @@
+https://cwtch.im/cwtch-explainer.mp4

fetch-libcwtch-go-macos.sh

@@ -3,4 +3,6 @@
 VERSION=`cat LIBCWTCH-GO-MACOS.version`
 echo $VERSION
 
-curl https://build.openprivacy.ca/files/libCwtch-go-macos-$VERSION/libCwtch.dylib --output libCwtch.dylib
+curl --fail https://build.openprivacy.ca/files/libCwtch-go-macos-$VERSION/libCwtch.x64.dylib --output libCwtch.x64.dylib
+curl --fail https://build.openprivacy.ca/files/libCwtch-go-macos-$VERSION/libCwtch.arm64.dylib --output libCwtch.arm64.dylib
+

fetch-libcwtch-go.ps1

@@ -1,6 +1,7 @@
 $Env:VERSION = type LIBCWTCH-GO.version
 echo $Env:VERSION
 
+# This should automatically fail on error...
 Invoke-WebRequest -Uri https://build.openprivacy.ca/files/libCwtch-go-$Env:VERSION/libCwtch.dll -OutFile windows/libCwtch.dll
 
 #Invoke-WebRequest -Uri https://build.openprivacy.ca/files/libCwtch-go-$Env:VERSION/cwtch.aar -OutFile android/cwtch/cwtch.aar

fetch-libcwtch-go.sh

@@ -3,5 +3,5 @@
 VERSION=`cat LIBCWTCH-GO.version`
 echo $VERSION
 
-wget https://build.openprivacy.ca/files/libCwtch-go-$VERSION/cwtch.aar -O android/cwtch/cwtch.aar
-wget https://build.openprivacy.ca/files/libCwtch-go-$VERSION/libCwtch.so -O linux/libCwtch.so
+curl --fail  https://build.openprivacy.ca/files/libCwtch-go-$VERSION/cwtch.aar --output android/cwtch/cwtch.aar
+curl --fail  https://build.openprivacy.ca/files/libCwtch-go-$VERSION/libCwtch.so --output linux/libCwtch.so

fetch-tor-macos.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cd macos
-curl https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-macos-0.4.6.7.tar.gz --output tor.tar.gz
+curl https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-macos-0.4.7.8.tar.gz --output tor.tar.gz
 tar -xzf tor.tar.gz
 chmod a+x Tor/tor.real
 cd ..

fetch-tor-win.ps1

@@ -1,6 +1,6 @@
 
-Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.6.5.zip -OutFile tor.zip
+Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.7.8.zip -OutFile tor.zip
 
-if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '7917561a7a063440a1ddfa9cb544ab9ffd09de84cea3dd66e3cc9cd349dd9f85b74a522ec390d7a974bc19b424c4d53af60e57bbc47e763d13cab6a203c4592f' ) { Write-Error 'tor.zip sha512sum mismatch' }
+if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '5b8f900a37f6e90d7a945b3903d769383c7478042cb43b2105d2374186e1a536f1a4758a2823d1d5be71d53a81dcfd8243293e04f82812d355983df322823cf4' ) { Write-Error 'tor.zip sha512sum mismatch' }
 
 Expand-Archive -Path tor.zip -DestinationPath Tor

fetch-tor.sh

@@ -1,12 +1,14 @@
 #!/bin/sh
 
-wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.5.9-linux-x86_64 -O linux/tor
-chmod a+x linux/tor
+cd linux
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.7.8-linux-x86_64.tar.gz -O tor.tar.gz
+tar -xzf tor.tar.gz
+cd ..
 
 mkdir -p android/app/src/main/jniLibs/arm64-v8a
-wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.4.9-arm64_pie -O android/app/src/main/jniLibs/arm64-v8a/libtor.so
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.7.10-arm64 -O android/app/src/main/jniLibs/arm64-v8a/libtor.so
 chmod a+x android/app/src/main/jniLibs/arm64-v8a/libtor.so
 
 mkdir -p android/app/src/main/jniLibs/armeabi-v7a
-wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.4.9-arm_pie -O android/app/src/main/jniLibs/armeabi-v7a/libtor.so
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.7.10-arm7 -O android/app/src/main/jniLibs/armeabi-v7a/libtor.so
 chmod a+x android/app/src/main/jniLibs/armeabi-v7a/libtor.so

index2.js

@@ -0,0 +1,20 @@
+
+var fs = require("fs");
+var reporter = require('cucumber-html-reporter');
+const reportRootDir = 'integration_test/gherkin/reports/'
+const jsonReportPath = `${reportRootDir}json_report.json`;
+const htmlReportPath = `${reportRootDir}cucumber_report.html`;
+const reportFile = fs.readFileSync(`${reportRootDir}integration_response_data.json`);
+//const jsonReport = JSON.parse(JSON.parse(reportFile).gherkin_reports)[0];
+const jsonReport = JSON.parse(reportFile);
+fs.writeFileSync(jsonReportPath, JSON.stringify(jsonReport));
+
+var options = {
+    theme: 'bootstrap',
+    jsonFile: jsonReportPath,
+    output: htmlReportPath,
+    reportSuiteAsScenarios: true,
+    launchReport: false,
+};
+
+reporter.generate(options);

integration_test/Readme.md

@@ -0,0 +1,60 @@
+## Environments
+
+Located in the `integration_test/env` folder and managed by the hooks in `integration_test/hooks/env.dart`. Specify the environment you want a feature to run in by tagging it.
+
+* `[no tag] (env/default)`: default environment to load if none is specified
+* `@env:aliceandbob1 (env/aliceandbob1)`: no-password Alice, Bob, and Carol profiles. Alice and Bob have already added each other, Carol has no contacts
+* `@env:persist (env/persist)`: changes made to this profile persist between features and scenarios (but NOT between runs)
+* `@env:clean`: runs the feature with no profile existing yet on disk
+
+## Tests
+
+[ ] 1. general
+  [X] splash screen + clean load
+  [X] setting save+load (TODO: dropdowns)
+  [~] tor status+reset
+  [~] shutdown cwtch
+[ ] 2. global settings (verify functionality)
+  [_] language # blocked by dropdown
+  [_] theme+color theme # blocked by dropdown
+  [ ] column mode -> background? so all tests check both modes?
+  [X] block unknown
+  [X] streamer mode
+[ ] 3. experiments (
+  [ ] group chat -> needs many
+  [ ] server hosting -> also many
+  [ ] file sharing -> a couple
+    [ ] image previews
+  [ ] clickable links (how much to test?)
+[ ] 4. profile mgmt
+  [X] create+delete
+  [X] default+password load
+  [X] name change
+  [ ] password change
+  [ ] known server mgmt
+[ ] 5. p2p chat
+  [ ] add, remove, block, archive
+  [ ] invite accept+reject
+  [X] send+receive
+    [ ] acks
+  [ ] try to send a long message
+  [ ] malformed messages, replies
+  [ ] overlays (invite, file/image)
+    [ ] send
+    [ ] receive
+    [ ] functionality
+[ ] 6. p2p settings
+  [ ] name saving + transmission
+  [ ] block (ui indicators, functionality) inc in groups
+  [ ] history save+load
+[ ] 7. groupchat
+  [ ] add, leave, archive
+  [ ] send+receive inc acks
+  [ ] try to send a long message
+  [ ] malformed messages, replies
+  [ ] overlays (invite, file/image) inc from non-contacts
+    [ ] send
+    [ ] receive
+    [ ] functionality
+[ ] 8. group settings
+  [ ] display name

integration_test/app_test.dart

@@ -1,53 +0,0 @@
-// This is a basic Flutter integration test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility that Flutter provides. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'dart:io';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:integration_test/integration_test.dart';
-
-import 'package:cwtch/main_test.dart' as app;
-
-void main() {
-  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-  _testMain();
-}
-
-void _testMain() {
-  testWidgets('Blocked message rejection test', (WidgetTester tester) async {
-    final String testerProfile = "mr roboto";
-    final String blockedProfile = "rudey";
-
-    // start the app and render a few frames
-    app.main();
-    await tester.pump(); await tester.pump(); await tester.pump();
-    //await tester.pumpAndSettle();
-
-    for (var i = 0; i < 30; i++) {
-      print("$i pump");
-      await tester.pump();
-    }
-
-    // log in to a profile with a blocked contact
-    await tester.tap(find.text(testerProfile));
-    await tester.pump(); await tester.pump(); await tester.pump();
-    expect(find.byIcon(Icons.block), findsOneWidget);
-
-    // use the debug control to inject a message from the contact
-    await tester.tap(find.byIcon(Icons.bug_report));
-    await tester.pump(); await tester.pump(); await tester.pump();
-
-
-    // screenshot test
-    print(Directory.current);
-    //Directory.current = "/home/erinn/AndroidStudioProjects/flwtch/integration_test";
-    await expectLater(find.byKey(Key('app')), matchesGoldenFile('blockedcontact.png'));
-    // any active message badges?
-    expect(find.text('1'), findsNothing);
-  });
-}

integration_test/env/aliceandbob1/dev/SALT

@@ -0,0 +1 @@
+_âeK%?Š!ţ~‡Lö9<C3B6>u×ÍlýQ’Q‚ż¦U•rMQCN5<4E>T-Ó/[<ń<ěn@KgŚă-ŕóŕČŃÓWÇ^l$řI‘C]»ÎI×7Đů@z¤m•Şb ŠNgířż?ő:†IşäD!ă±6ć°%čě…b

integration_test/env/aliceandbob1/dev/profiles/648b3aac5a139faadf74661983ab072e/SALT

@@ -0,0 +1 @@
+¢‰qö3‰ ÉÌ¥êÒŽB7Å¢(Ê–vQBöÞɱ<C389>øŒœ¾F±zŠ\\UƒÈG[Ü/£Ñ?uš¼\;]y”›HþG|þÛ,Þ
3x
ÛÞe‘E0!¬ÄSÍž<nÐÃòÐÉ®M~üw “ÀëQ@6Ǹ˒Öo£ÉüØ…ÕöÀi’ò

integration_test/env/aliceandbob1/dev/profiles/648b3aac5a139faadf74661983ab072e/VERSION

@@ -0,0 +1 @@
+2

integration_test/env/aliceandbob1/dev/profiles/aef99a4db367d0a06f8a351f4732e2db/SALT

@@ -0,0 +1 @@
+;KĄĂ”ČÓŠť\|ç<ÂŐÉ^1iRüÁw°ôFŔQĄ'¢©©z{P4ĂP(ä"5͸Qpr7˝`ŇK^uý¸ČÖ;©1&Ĺ,vŞ
K/YößžŹ‹mĄâ}±3›]/§v"&ĽiѸ!3Wîyëjuvą¶D+w_'

integration_test/env/aliceandbob1/dev/profiles/aef99a4db367d0a06f8a351f4732e2db/VERSION

@@ -0,0 +1 @@
+2

integration_test/env/aliceandbob1/dev/profiles/c39e0660a885b6000173ffea9d214b5c/SALT

@@ -0,0 +1,2 @@
+¢ž»5‡Ä	ô<03>m-J0újÕx­ ŽÙð•ÛjÙß“K×çøs³C=íà¾t¶-ÿD÷ñÇecàIXF`íI´
+÷³6
Vr×gp4ËBóäÞS¿E<C2BF>tv–ìíä1iù¢‡”}ûZóÈWMóŒöIÈ´»1þ‡KB||Å,¢fEž%<<3C>D

integration_test/env/aliceandbob1/dev/profiles/c39e0660a885b6000173ffea9d214b5c/VERSION

@@ -0,0 +1 @@
+2

integration_test/env/default/dev/SALT

@@ -0,0 +1 @@
+ó„Ý g–Þd7èfª>ZrPòV`dB<(÷	ôÈW`½
7¾c´¬n•ËnŠ.ü¾s8lÿ·“*dZUmÊŠí&‹¸ÊhøEëö8mê’<1E>«Y ŸüñrÒý×W’²H%{¸iùFÃÎ<äÿ[0²Ñâ”\yÚø-¯R½L´¨ -'

integration_test/env/default/dev/ui.globals

@@ -0,0 +1,2 @@
+DÍk­Hzöĺ’N(Ăĺ•őŐ`x<>ć—×ë#€ÍěĎ3—]Öc˛QŽ,Ą2_Ś3‰őťŞRC6~-zSÉĘ?JŽčĐ<>4 fřŔăhŢýüv˝F†8áBü1Q\˛"lHh5í§
<¦‹;$J3č"źúBamT5<Á4îě•Żcj™ÚŽśËgˇŹÉ›/<2F>‰vęĽnKÄßVG†Ű~YdŞG	ÝrQPÁrôŕ<C3B4>l›jěăČ-Aľ‹‹Z’Ľy÷_Ľ¸˙˛M·ôÄĽĂ!AX^HR˘¦ç<>őX;ăŘ©Ô)@2šŔ”tŕÍŁä	ý´[cdX®ĹĹ­+ý,0wa}ß%<25><11>
+Ď9˘x[ÝČNP]Ĺ5o‘_‘M@Ą†™±!©•Ű0:IÄŮóv€ó;ź ÔĂP¨Öe?€˛Śip*‰{<ŐČ—´,RyMnď-‡gËťëĺÉfŹÚV›<56>Dá>łĐ;S8őĎ0l¦k
"ľÖöĘ1˝żA4ţ<11>vG6î€Uş^–"zÓ«H¸´e”S•<53>°u\čč=Ś5ńë¨Ů¤»]aď˝3ąďí©g`
î-SŻŢŰ…ý#ăE÷× ¸=Śµ˘W,8­đdŚĚä.˙Ž҉=şPüÖ•Ąń_<C584>jäĎřĚvyěž,Ľî<˙xokV»`<60>vQ|Ć/©˙ťs˝0şę-tÖ-ßĂ[şa›=ý­ôßć<>ŕé÷µ×łëöN­řmďV!qŘŹZ†Т˛Ł Ě˛±saŢSúT‚ż€”ôîěuDąL<>­-‘Ç"šŇíRşŁŰ<*'ófgߧČM~ŇŚ"sŐ<73>âl/xuĹ<řsÂÄ4÷~Ůf>yś§`¦­NÝ{ľ¨b!Ey'ˇězęoZ!×<>\"´a(Ýp,PhŔrZ…Ő‹Mµ-…ë+ĐľÇĆąÉŚťÎĘÝô\}ë~ł?sJL|ú©z‚˙·°IaXYh/áRüą2;vą“u§…ÉĽ<C389>P€(

integration_test/features/01_general/01_splash.feature

@@ -0,0 +1,12 @@
+@env:clean
+Feature: Splash screen displays and then closes
+  Scenario: splash screen appears
+    Then I expect the widget 'SplashView' to be present within 10 seconds
+    Then I expect the widget 'ProfileManagerView' to be present within 10 seconds
+    # first-run of cwtch creates expected files and folders
+    Then I expect the folder 'integration_test/env/temp' to exist
+    And I expect the folder 'integration_test/env/temp/dev' to exist
+    And I expect the file 'integration_test/env/temp/dev/SALT' to exist
+    And I expect the file 'integration_test/env/temp/dev/ui.globals' to exist
+    And I expect the folder 'integration_test/env/temp/dev/tor' to exist
+    And I expect the file 'integration_test/env/temp/dev/tor/torrc' to exist

integration_test/features/01_general/02_save_load.feature

@@ -0,0 +1,50 @@
+@env:persist
+Feature: Settings pane opens and can save settings persistently
+  Scenario: Open the Settings pane
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    And I tap the 'OpenSettingsView' button
+    And I wait until the text 'Cwtch Settings' is present
+    And I take a screenshot
+
+  Scenario: Change every setting (except Language)
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    Given I tap the 'OpenSettingsView' button
+    And I wait until the text 'Use Light Themes' is present
+    When I tap the widget that contains the text "Use Light Themes"
+    And I tap the widget that contains the text "Block Unknown Contacts"
+    And I tap the widget that contains the text "Streamer/Presentation Mode"
+    And I tap the widget that contains the text "Enable Experiments"
+    Then I wait until the text 'Enable Group Chat' is present
+    And I tap the widget that contains the text "Enable Group Chat"
+    And I tap the widget that contains the text "Hosting Servers"
+    And I tap the widget that contains the text "File Sharing"
+    Then I wait until the text 'Image Previews and Profile Pictures' is present
+    And I tap the widget that contains the text "Image Previews and Profile Pictures"
+    And I wait until the text 'Download Folder' is present
+    And I fill the "DownloadFolderPicker" field with "/this/is/a/test"
+    And I tap the widget that contains the text "Enable Clickable Links"
+    Then I expect the switch that contains the text "Use Light Themes" to be checked
+    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
+    And I expect the switch that contains the text "Streamer/Presentation Mode" to be checked
+    And I expect the switch that contains the text "Enable Experiments" to be checked
+    And I expect the switch that contains the text "Enable Group Chat" to be checked
+    And I expect the switch that contains the text "Hosting Servers" to be checked
+    And I expect the switch that contains the text "File Sharing" to be checked
+    And I expect the switch that contains the text "Image Previews and Profile Pictures" to be checked
+    And I expect the "DownloadFolderPicker" to be "/this/is/a/test"
+    And I expect the switch that contains the text "Enable Clickable Links" to be checked
+
+  Scenario: When the app is reloaded, settings from the previous scenario have persisted
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    Given I tap the 'OpenSettingsView' button
+    And I wait until the text 'Use Light Themes' is present
+    Then I expect the switch that contains the text "Use Light Themes" to be checked
+    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
+    And I expect the switch that contains the text "Streamer/Presentation Mode" to be checked
+    And I expect the switch that contains the text "Enable Experiments" to be checked
+    And I expect the switch that contains the text "Enable Group Chat" to be checked
+    And I expect the switch that contains the text "Hosting Servers" to be checked
+    And I expect the switch that contains the text "File Sharing" to be checked
+    And I expect the switch that contains the text "Image Previews and Profile Pictures" to be checked
+    And I expect the "DownloadFolderPicker" to be "/this/is/a/test"
+    And I expect the switch that contains the text "Enable Clickable Links" to be checked

integration_test/features/01_general/03_tor.feature

@@ -0,0 +1,14 @@
+Feature: Tor initializes correctly
+  Scenario: Check the Tor version
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    And I tap the icon with type "TorIcon"
+    Then I expect the Tor version to be present
+    And I expect the string 'Online' to be present within 60 seconds
+
+  Scenario: Reset Tor
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    And I tap the icon with type "TorIcon"
+    Then I expect the string 'Online' to be present within 60 seconds
+    Then I tap the button that contains the text "Reset"
+    And I wait for 1 second
+    Then I expect the text "Online" to be absent

integration_test/features/01_general/04_shutdown.feature

@@ -0,0 +1,8 @@
+Feature: Shutdown Cwtch button works correctly
+  Scenario: Clicking 'Shutdown Cwtch' shuts down Cwtch
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    And I tap the button with tooltip 'Shutdown Cwtch'
+    Then I expect the text 'Shutdown Cwtch?' to be present
+    #this also kills the testing framework sadly. will have to find a workaround
+    #And I tap the button that contains the text 'Shutdown Cwtch'
+    #Then I wait until the widget with type 'ProfileMgrView' is absent

integration_test/features/02_global_settings/01_language.feature

@@ -0,0 +1,16 @@
+Feature: Global 'language' setting
+  Scenario: Change the language to French and back
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    Given I tap the 'OpenSettingsView' button
+    And I wait until the text 'Language' is present
+    Then I expect the text 'Language' to be present
+    And I expect the text 'Langue' to be absent
+    When I tap the widget that contains the text "English"
+    And I wait until the text 'French' is present
+    And I tap the widget that contains the text "French"
+    And I wait until the text 'Langue' is present
+    And I expect the text 'Language' to be absent
+    When I tap the widget that contains the text "Français"
+    And I tap the widget that contains the text "Anglais"
+    And I wait until the text 'Language' is present
+    And I expect the text 'Langue' to be absent

integration_test/features/02_global_settings/02_theme.feature

@@ -0,0 +1,12 @@
+Feature: Global 'Theme' setting
+  Scenario: Change the theme to Mermaid
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    Given I tap the 'OpenSettingsView' button
+    And I wait for 1 second
+    When I tap the "DropdownTheme" button
+    And I tap the element that contains the text "Mermaid"
+  Scenario: Change the theme to Light Mode
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    Given I tap the 'OpenSettingsView' button
+    And I wait for 1 second
+    And I tap the widget that contains the text "Theme"

integration_test/features/02_global_settings/04_block_unknown.feature

@@ -0,0 +1,20 @@
+@env:aliceandbob1
+Feature: Block unknown contacts setting
+  Scenario: Carol adds Alice but Alice doesn't see it because Block Unknowns is enabled
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    Given I tap the 'OpenSettingsView' button
+    When I tap the widget that contains the text "Block Unknown Contacts"
+    Then I expect the switch that contains the text "Block Unknown Contacts" to be checked
+    Given I tap the back button
+    And I wait until the text "Carol" is present
+    And I tap the button that contains the text "Carol"
+    And I tap the button with tooltip "Add a new contact or conversation"
+    When I fill the "txtAddP2P" field with "vbmmsbx3rhndpfz6t3jkrd7m3yu62xzrldxkdgsw4rsehiwuw3tmo7yd"
+    And I wait for 1 second
+    And I take a screenshot
+    And I tap the back button
+    And I wait until the text "Alice" is present
+    And I wait until the tooltip "Online" is present
+    And I tap the button that contains the text "Alice"
+    And I wait for 20 seconds
+    Then I expect the text "yxj2pvhozedflp4g7yitpqkeho63maaffi2qgsj3e6s2fbmosuuas2qd" to be absent

integration_test/features/02_global_settings/05_streamer.feature

@@ -0,0 +1,18 @@
+@env:aliceandbob1
+Feature: Streamer mode
+  Scenario: All onions disappear when Streamer Mode is enabled
+    Given I wait until the widget with type 'ProfileMgrView' is present
+    And I wait until the text "vbmmsbx3rhndpfz6t3jkrd7m3yu62xzrldxkdgsw4rsehiwuw3tmo7yd" is present
+    And I wait until the text "pjurzypqui3dnpxj6aemk6cqz22yx6zfr5lq4jzu7muwe2yyx2zrnzyd" is present
+    Given I tap the 'OpenSettingsView' button
+    And I wait for 1 second
+    And I tap the widget that contains the text "Streamer/Presentation Mode"
+    Then I expect the switch that contains the text "Streamer/Presentation Mode" to be checked
+    When I tap the back button
+    And I wait until the text "Alice" is present
+    And I wait until the text "Bob" is present
+    Then I expect the text "vbmmsbx3rhndpfz6t3jkrd7m3yu62xzrldxkdgsw4rsehiwuw3tmo7yd" to be absent
+    And I expect the text "pjurzypqui3dnpxj6aemk6cqz22yx6zfr5lq4jzu7muwe2yyx2zrnzyd" to be absent
+    When I tap the button that contains the text "Alice"
+    Then I expect the text "vbmmsbx3rhndpfz6t3jkrd7m3yu62xzrldxkdgsw4rsehiwuw3tmo7yd" to be absent
+    And I expect the text "pjurzypqui3dnpxj6aemk6cqz22yx6zfr5lq4jzu7muwe2yyx2zrnzyd" to be absent

integration_test/features/04_profile_mgmt/01_create_delete.feature

@@ -0,0 +1,90 @@
+@env:persist
+Feature: Basic Profile Management
+    Scenario: Error on Creating a Profile without a Display Name
+        Given I wait until the widget with type 'ProfileMgrView' is present
+        And I tap the button with tooltip "Add new profile"
+        Then I expect the text 'Display Name' to be present
+        And I expect the text 'New Password' to be present
+        And I expect the text 'Please enter a display name' to be absent
+        Then I tap the "button" widget with label "Add new profile"
+        And I expect the text 'Please enter a display name' to be present
+        And I take a screenshot
+
+    Scenario: Create Unencrypted Profile
+        Given I wait until the widget with type 'ProfileMgrView' is present
+        And I tap the button with tooltip "Add new profile"
+        Then I expect the text 'Display Name' to be present
+        And I expect the text 'New Password' to be present
+        And I take a screenshot
+        Then I tap the "passwordCheckBox" widget
+        And I expect the text 'New Password' to be absent
+        And I take a screenshot
+        Then I fill the "displayNameFormElement" field with "Alice (Unencrypted)"
+        Then I tap the "button" widget with label "Add new profile"
+        And I expect a "ProfileRow" widget with text "Alice (Unencrypted)"
+        And I take a screenshot
+        Then I tap the "ProfileRow" widget with label "Alice (Unencrypted)"
+        And I expect the text "Alice (Unencrypted) » Conversations" to be present
+        And I take a screenshot
+
+    Scenario: Load Unencrypted Profile
+        Given I wait until the widget with type 'ProfileMgrView' is present
+        Then I expect a "ProfileRow" widget with text "Alice (Unencrypted)"
+
+    Scenario: Create Encrypted Profile
+        Given I wait until the widget with type 'ProfileMgrView' is present
+        And I tap the button with tooltip "Add new profile"
+        Then I expect the text 'Display Name' to be present
+        And I expect the text 'New Password' to be present
+        And I take a screenshot
+        Then I fill the "displayNameFormElement" field with "Alice (Encrypted)"
+        Then I fill the "passwordFormElement" field with "password1"
+        Then I fill the "confirmPasswordFormElement" field with "password1"
+        And I take a screenshot
+        Then I tap the "button" widget with label "Add new profile"
+        And I expect a "ProfileRow" widget with text "Alice (Encrypted)"
+        And I take a screenshot
+        Then I tap the "ProfileRow" widget with label "Alice (Encrypted)"
+        And I expect the text 'Alice (Encrypted) » Conversations' to be present
+        And I take a screenshot
+
+    Scenario: Load an Encrypted Profile by Unlocking it with a Password
+        Given I wait until the widget with type 'ProfileMgrView' is present
+        Then I expect the text 'Enter a password to view your profiles' to be absent
+        And I tap the button with tooltip "Unlock encrypted profiles by entering their password."
+        Then I expect the text 'Enter a password to view your profiles' to be present
+        When I fill the "unlockPasswordProfileElement" field with "password1"
+        And I tap the "button" widget with label "Unlock"
+        Then I expect a "ProfileRow" widget with text "Alice (Encrypted)"
+
+    Scenario: Load an Encrypted Profile by Unlocking it with a Password and Change the Name
+        Given I wait until the widget with type 'ProfileMgrView' is present
+        Then I expect the text 'Enter a password to view your profiles' to be absent
+        And I tap the button with tooltip "Unlock encrypted profiles by entering their password."
+        Then I expect the text 'Enter a password to view your profiles' to be present
+        When I fill the "unlockPasswordProfileElement" field with "password1"
+        And I tap the "button" widget with label "Unlock"
+        Then I expect a "ProfileRow" widget with text "Alice (Encrypted)"
+        When I tap the "IconButton" widget with tooltip "Edit Profile Alice (Encrypted)"
+        Then I expect the text 'Display Name' to be present
+        Then I fill the "displayNameFormElement" field with "Carol (Encrypted)"
+        And I tap the "button" widget with label "Save Profile"
+        And I wait until the widget with type 'ProfileMgrView' is present
+        Then I expect a "ProfileRow" widget with text "Carol (Encrypted)"
+
+     Scenario: Delete an Encrypted Profile
+         Given I wait until the widget with type 'ProfileMgrView' is present
+         Then I expect the text 'Enter a password to view your profiles' to be absent
+         And I tap the button with tooltip "Unlock encrypted profiles by entering their password."
+         Then I expect the text 'Enter a password to view your profiles' to be present
+         When I fill the "unlockPasswordProfileElement" field with "password1"
+         And I tap the "button" widget with label "Unlock"
+         Then I expect a "ProfileRow" widget with text "Carol (Encrypted)"
+         And I take a screenshot
+         When I tap the "IconButton" widget with tooltip "Edit Profile Carol (Encrypted)"
+         Then I expect the text 'Display Name' to be present
+         When I tap the button that contains the text "Delete"
+         Then I expect the text "Really Delete Profile" to be present
+         When I tap the "button" widget with label "Really Delete Profile"
+         And I wait until the widget with type 'ProfileMgrView' is present
+         Then I expect a "ProfileRow" widget with text "Carol (Encrypted)" to be absent

integration_test/features/05_p2p_chat/03_send_receive.feature

@@ -0,0 +1,31 @@
+@env:aliceandbob1
+Feature: Sending and receiving chat messages
+  Background:
+    Given I wait until the widget with type "ProfileRow" is present
+    And I wait for 4 seconds
+    Given I tap the button that contains the text "Alice"
+    And I tap the button that contains the text "Bob"
+    And I wait until the text "Contact is offline, messages can't be delivered right now" is absent
+    #And I wait for 6 seconds
+    When I fill the "txtCompose" field with "hello! this is a test!"
+    And I tap the "btnSend" button
+    Then I expect a "MessageBubble" widget with text "hello! this is a test!\u202F" to be present within 5 seconds
+    #Then I expect the text "hello! this is a test!" to be present
+    And I tap the back button
+    And I tap the back button
+
+  Scenario: Bob receives the message from Alice
+    Given I tap the button that contains the text "Bob"
+    And I tap the button that contains the text "Alice"
+    Then I expect a "MessageBubble" widget with text "hello! this is a test!\u202F" to be present within 5 seconds
+
+  Scenario: Bob replies to a message from Alice
+    Given I tap the button that contains the text "Bob"
+    And I tap the button that contains the text "Alice"
+    #When I swipe right by 15 pixels on the element that contains the text "hello! this is a test!\u202F"
+    #When I swipe right by 15 pixels on the widget of type "MessageBubble" with text "hello! this is a test!\u202F"
+    And I tap the button with tooltip "Reply to this message"
+    And I fill the "txtCompose" field with "yay the test worked"
+    And I tap the "btnSend" button
+    Then I expect to see the message "yay the test worked\u202F" replying to "hello! this is a test!" within 5 seconds
+    And I take a screenshot

integration_test/gherkin_suite_test.editable.dart

@@ -0,0 +1,107 @@
+//import 'package:flutter_gherkin/flutter_gherkin_integration_test.dart'; // notice new import name
+import 'package:flutter_gherkin/flutter_gherkin.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:gherkin/gherkin.dart';
+
+import 'dart:io';
+
+// The application under test.
+import 'package:cwtch/main.dart' as app;
+import 'package:glob/glob.dart';
+
+import 'gherkin_suite_test.dart';
+import 'hooks/env.dart';
+import 'steps/chat.dart';
+import 'steps/files.dart';
+import 'steps/form_elements.dart';
+import 'steps/overrides.dart';
+import 'steps/text.dart';
+import 'steps/utils.dart';
+
+part 'gherkin_suite_test.g.dart';
+
+const REPLACED_BY_SCRIPT = <String>['integration_test/features/**.feature'];
+
+@GherkinTestSuite(executionOrder: ExecutionOrder.alphabetical, featurePaths: REPLACED_BY_SCRIPT)
+void main() async {
+  final params = [
+    SwitchStateParameter(),
+  ];
+
+  final steps = [
+    // chat elements
+    ExpectReply(),
+    // form elements
+    CheckSwitchState(),
+    CheckSwitchStateWithText(),
+    DropdownChoose(),
+    // utils
+    TakeScreenshot(),
+    // overrides
+    TapWidgetWithType(),
+    TapWidgetWithLabel(),
+    TapWidgetWithTooltip(),
+    ExpectWidgetWithText(),
+    AbsentWidgetWithText(),
+    WaitUntilTypeExists(),
+    ExpectTextToBePresent(),
+    ExpectWidgetWithTextWithin(),
+    WaitUntilTextExists(),
+    WaitUntilTooltipExists(),
+    SwipeOnType(),
+    // text
+    TorVersionPresent(),
+    TooltipTap(),
+    // files
+    FolderExists(),
+    FileExists(),
+  ];
+
+  var sb = StringBuffer();
+  sb
+    ..writeln("## Custom Parameters\n")
+    ..writeln("| name | pattern |")
+    ..writeln("| --- | --- |");
+  for (var i in params) {
+    sb
+      ..write("| ")
+      ..write(i.identifier)
+      ..write(" | ")
+      ..write(i.pattern.toString().replaceFirst("RegExp: pattern=", "").replaceFirst(" flags=i", "").replaceAll("|", "&#124;"))
+      ..writeln(" |");
+  }
+  sb
+    ..writeln("\n## Custom steps\n")
+    ..writeln("| pattern |")
+    ..writeln("| --- |");
+  for (var i in steps) {
+    sb.writeln(i.pattern.toString().replaceFirst("RegExp: pattern=", "| ").replaceFirst(" flags=", " |").replaceAll("|", "&#124;"));
+  }
+  var f = File("integration_test/CustomSteps.md");
+  f.writeAsString(sb.toString());
+
+  await executeTestSuite(
+    configuration: FlutterTestConfiguration(
+        reporters: [
+          StdoutReporter(MessageLevel.verbose)
+            ..setWriteLineFn(print)
+            ..setWriteFn(print),
+          ProgressReporter()
+            ..setWriteLineFn(print)
+            ..setWriteFn(print),
+          TestRunSummaryReporter()
+            ..setWriteLineFn(print)
+            ..setWriteFn(print),
+          JsonReporter(),
+        ],
+        customStepParameterDefinitions: [
+          SwitchStateParameter(),
+        ],
+        stepDefinitions: steps,
+        hooks: [
+          ResetCwtchEnvironment(),
+          AttachScreenshotOnFailedStepHook(),
+        ]),
+    appMainFunction: (World world) => app.main(),
+  );
+}

integration_test/hooks/env.dart

@@ -0,0 +1,50 @@
+import 'dart:io';
+
+import 'package:gherkin/gherkin.dart';
+
+class ResetCwtchEnvironment extends Hook {
+  @override
+  int get priority => 10;
+
+  @override
+  Future<void> onBeforeRun(TestConfiguration config) async {
+    // initialize @env:persist
+    await Process.run("rm", ["-rf", "integration_test/env/temp-persist"]);
+    await Process.run("rm", ["-rf", "integration_test/env/temp"]);
+    await Process.run("cp", ["-R", "integration_test/env/persist", "integration_test/env/temp-persist"]);
+
+    return super.onBeforeRun(config);
+  }
+
+  @override
+  Future<void> onAfterRun(TestConfiguration config) async {
+    // Clean up After a Test Run...
+    print("clean up environments after run...");
+    await Process.run("rm", ["-rf", "integration_test/env/temp-persist"]);
+    await Process.run("rm", ["-rf", "integration_test/env/temp"]);
+    return super.onAfterRun(config);
+  }
+
+  @override
+  Future<void> onBeforeScenario(TestConfiguration config, String scenario, Iterable<Tag> tags) async {
+    if (tags.any((t) => t.name == "@env:persist")) {
+      await Process.run("mv", ["integration_test/env/temp-persist", "integration_test/env/temp"]);
+    } else if (tags.any((t) => t.name == "@env:aliceandbob1")) {
+      await Process.run("cp", ["-R", "integration_test/env/aliceandbob1", "integration_test/env/temp"]);
+    } else if (!(tags.any((t) => t.name == "@env:clean"))) {
+      // use the default environment if no @env: tag specified
+      await Process.run("cp", ["-R", "integration_test/env/default", "integration_test/env/temp"]);
+    } else {
+      print("clean environment initialized");
+    }
+    return super.onBeforeScenario(config, scenario, tags);
+  }
+
+  @override
+  Future<void> onAfterScenario(TestConfiguration config, String scenario, Iterable<Tag> tags, {bool passed = true}) async {
+    if (tags.any((t) => t.name == "@env:persist")) {
+      await Process.run("mv", ["integration_test/env/temp", "integration_test/env/temp-persist"]);
+    }
+    return super.onAfterScenario(config, scenario, tags);
+  }
+}

integration_test/steps/chat.dart

@@ -0,0 +1,34 @@
+import 'package:cwtch/main.dart';
+import 'package:cwtch/widgets/messagebubble.dart';
+import 'package:cwtch/widgets/profilerow.dart';
+import 'package:cwtch/widgets/quotedmessage.dart';
+import 'package:cwtch/widgets/tor_icon.dart';
+import 'package:cwtch/views/profilemgrview.dart';
+import 'package:flutter_gherkin/flutter_gherkin.dart';
+import 'package:flutter_gherkin/src/flutter/parameters/existence_parameter.dart';
+import 'package:flutter_gherkin/src/flutter/parameters/swipe_direction_parameter.dart';
+import 'package:gherkin/gherkin.dart';
+
+import 'package:flutter/material.dart';
+
+import 'overrides.dart';
+
+StepDefinitionGeneric ExpectReply() {
+  return given3<String, String, int, FlutterWorld>(
+    RegExp(r'I expect to see the message {string} replying to {string} within {int} second(s)$'),
+    (originalMessage, responseMessage, seconds, context) async {
+      await context.world.appDriver.waitUntil(
+        () async {
+          await context.world.appDriver.waitForAppToSettle();
+
+          return await context.world.appDriver.isPresent(
+                  context.world.appDriver.findByDescendant(context.world.appDriver.findBy(QuotedMessageBubble, FindType.type), context.world.appDriver.findBy(originalMessage, FindType.text))) &&
+              await context.world.appDriver.isPresent(
+                  context.world.appDriver.findByDescendant(context.world.appDriver.findBy(QuotedMessageBubble, FindType.type), context.world.appDriver.findBy(responseMessage, FindType.text)));
+        },
+        timeout: Duration(seconds: seconds),
+      );
+    },
+    configuration: StepDefinitionConfiguration()..timeout = const Duration(days: 1),
+  );
+}

integration_test/steps/files.dart

@@ -0,0 +1,21 @@
+import 'dart:io';
+import 'package:flutter_gherkin/flutter_gherkin.dart';
+import 'package:gherkin/gherkin.dart';
+
+StepDefinitionGeneric FolderExists() {
+  return then1<String, FlutterWorld>(
+    RegExp(r'I expect the folder {string} to exist'),
+    (input1, context) async {
+      context.expect(Directory(input1).existsSync(), true);
+    },
+  );
+}
+
+StepDefinitionGeneric FileExists() {
+  return then1<String, FlutterWorld>(
+    RegExp(r'I expect the file {string} to exist'),
+    (input1, context) async {
+      context.expect(File(input1).existsSync(), true);
+    },
+  );
+}

integration_test/steps/form_elements.dart

@@ -0,0 +1,78 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:flutter_gherkin/flutter_gherkin.dart';
+import 'package:gherkin/gherkin.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+
+enum SwitchState { checked, unchecked }
+
+class SwitchStateParameter extends CustomParameter<SwitchState> {
+  SwitchStateParameter()
+      : super("toggle", RegExp(r"(checked|unchecked)", caseSensitive: false), (s) {
+          switch (s.toLowerCase()) {
+            case "checked":
+              return SwitchState.checked;
+            case "unchecked":
+              return SwitchState.unchecked;
+          }
+        });
+}
+
+class CheckSwitchState extends Given2WithWorld<String, SwitchState, FlutterWorld> {
+  @override
+  Future<void> executeStep(String input1, SwitchState state) async {
+    final switch1 = world.appDriver.findBy(input1, FindType.key);
+    bool switch1exists = await world.appDriver.isPresent(switch1);
+    expect(switch1exists, true);
+    if (switch1exists) {
+      SwitchListTile wdgt = await world.appDriver.widget(switch1);
+      expect(wdgt.value, state == SwitchState.checked);
+    }
+  }
+
+  @override
+  RegExp get pattern => RegExp(r"I expect the {string} widget to be {toggle}");
+}
+
+StepDefinitionGeneric CheckSwitchStateWithText() {
+  return then2<String, SwitchState, FlutterWorld>(
+    RegExp(r'I expect the switch that contains the text {string} to be {toggle}'),
+    (input1, state, context) async {
+      final textFinder = context.world.appDriver.findBy(input1, FindType.text);
+      await context.world.appDriver.scrollIntoView(textFinder);
+      final switchTypeFinder = context.world.appDriver.findBy(SwitchListTile, FindType.type);
+      final switchFinder = context.world.appDriver.findByAncestor(textFinder, switchTypeFinder);
+      SwitchListTile switchWidget = await context.world.appDriver.widget(switchFinder);
+      context.expect(switchWidget.value, state == SwitchState.checked);
+    },
+  );
+}
+
+StepDefinitionGeneric DropdownChoose() {
+  return then2<int, String, FlutterWorld>(
+    RegExp(r'I choose option {int} from the {string} dropdown'),
+    (idx, input1, context) async {
+      await context.world.appDriver.waitForAppToSettle();
+      final ddFinder = context.world.appDriver.findBy(input1, FindType.key);
+      await context.world.appDriver.scrollIntoView(ddFinder);
+      await context.world.appDriver.waitForAppToSettle();
+      await context.world.appDriver.tap(ddFinder);
+      await context.world.appDriver.waitForAppToSettle();
+
+      // somewhat complicated due to widget structure... we need to:
+      // find [ancestor of type DropdownMenuItem] of [[Text with value <text of element #idx>] contained within Dropdown]
+      DropdownButton ddWidget = await context.world.appDriver.widget(ddFinder);
+      DropdownMenuItem itemWidget = ddWidget.items!.elementAt(idx);
+      final itemText = (itemWidget.child as Text).data.toString();
+      final textFinder = context.world.appDriver.findBy(itemText, FindType.text);
+      final textWithinFinder = context.world.appDriver.findByDescendant(ddFinder, textFinder);
+      final ddiFinder = context.world.appDriver.findBy(DropdownMenuItem<String>, FindType.type);
+      //final ddiFinder = context.world.appDriver.findBy(_MenuItem, FindType.type);
+      final itemFinder = context.world.appDriver.findByAncestor(textWithinFinder, ddiFinder, firstMatchOnly: true);
+      await context.world.appDriver.tap(itemFinder);
+      await context.world.appDriver.waitForAppToSettle();
+    },
+  );
+}

integration_test/steps/overrides.dart

@@ -0,0 +1,267 @@
+// this file contains steps from flutter_gherkin with bugfixes/adaptations to our codebase
+
+import 'package:cwtch/main.dart';
+import 'package:cwtch/widgets/messagebubble.dart';
+import 'package:cwtch/widgets/profilerow.dart';
+import 'package:cwtch/widgets/tor_icon.dart';
+import 'package:cwtch/views/profilemgrview.dart';
+import 'package:flutter_gherkin/flutter_gherkin.dart';
+import 'package:flutter_gherkin/src/flutter/parameters/existence_parameter.dart';
+import 'package:flutter_gherkin/src/flutter/parameters/swipe_direction_parameter.dart';
+import 'package:gherkin/gherkin.dart';
+
+import 'package:flutter/material.dart';
+
+StepDefinitionGeneric TapWidgetWithType() {
+  return given1<String, FlutterWorld>(
+    RegExp(r'I tap the (?:button|element|label|icon|field|text|widget) with type {string}$'),
+    (input1, context) async {
+      await context.world.appDriver.tap(
+        context.world.appDriver.findBy(
+          widgetTypeByName(input1),
+          FindType.type,
+        ),
+      );
+      await context.world.appDriver.waitForAppToSettle();
+    },
+  );
+}
+
+StepDefinitionGeneric TapWidgetWithLabel() {
+  return given2<String, String, FlutterWorld>(
+    RegExp(r'I tap the {string} widget with label {string}$'),
+    (ofType, text, context) async {
+      final finder =
+          context.world.appDriver.findByDescendant(context.world.appDriver.findBy(widgetTypeByName(ofType), FindType.type), context.world.appDriver.findBy(text, FindType.text), firstMatchOnly: true);
+      //Text wdg = await context.world.appDriver.widget(finder, ExpectedWidgetResultType.first);
+      //print(wdg.debugDescribeChildren().first.)
+      await context.world.appDriver.scrollIntoView(finder);
+      await context.world.appDriver.tap(finder);
+      await context.world.appDriver.waitForAppToSettle();
+    },
+  );
+}
+
+StepDefinitionGeneric TapWidgetWithTooltip() {
+  return given2<String, String, FlutterWorld>(
+    RegExp(r'I tap the {string} widget with tooltip {string}$'),
+    (ofType, text, context) async {
+      final finder = context.world.appDriver
+          .findByDescendant(context.world.appDriver.findBy(widgetTypeByName(ofType), FindType.type), context.world.appDriver.findBy(text, FindType.tooltip), firstMatchOnly: true);
+      await context.world.appDriver.scrollIntoView(finder);
+      await context.world.appDriver.tap(finder);
+      await context.world.appDriver.waitForAppToSettle();
+    },
+  );
+}
+
+StepDefinitionGeneric ExpectWidgetWithText() {
+  return given2<String, String, FlutterWorld>(
+    RegExp(r'I expect a {string} widget with text {string}$'),
+    (ofType, text, context) async {
+      final finder =
+          context.world.appDriver.findByDescendant(context.world.appDriver.findBy(widgetTypeByName(ofType), FindType.type), context.world.appDriver.findBy(text, FindType.text), firstMatchOnly: true);
+      //Text wdg = await context.world.appDriver.widget(finder, ExpectedWidgetResultType.first);
+      //print(wdg.debugDescribeChildren().first.)
+      await context.world.appDriver.isPresent(finder);
+      await context.world.appDriver.waitForAppToSettle();
+    },
+  );
+}
+
+StepDefinitionGeneric AbsentWidgetWithText() {
+  return given2<String, String, FlutterWorld>(
+    RegExp(r'I expect a {string} widget with text {string} to be absent$'),
+    (ofType, text, context) async {
+      final finder =
+          context.world.appDriver.findByDescendant(context.world.appDriver.findBy(widgetTypeByName(ofType), FindType.type), context.world.appDriver.findBy(text, FindType.text), firstMatchOnly: true);
+      //Text wdg = await context.world.appDriver.widget(finder, ExpectedWidgetResultType.first);
+      //print(wdg.debugDescribeChildren().first.)
+      await context.world.appDriver.isAbsent(finder);
+      await context.world.appDriver.waitForAppToSettle();
+    },
+  );
+}
+
+StepDefinitionGeneric TapButtonWithText() {
+  return given1<String, FlutterWorld>(
+    RegExp(r'I tap the {string} (?:button|element|label|icon|field|text|widget)$'),
+    (input1, context) async {
+      final finder = context.world.appDriver.findByDescendant(context.world.appDriver.findBy(Flwtch, FindType.type), context.world.appDriver.findBy(input1, FindType.key), firstMatchOnly: true);
+      await context.world.appDriver.scrollIntoView(finder);
+      await context.world.appDriver.tap(finder);
+      await context.world.appDriver.waitForAppToSettle();
+    },
+  );
+}
+
+StepDefinitionGeneric WaitUntilTypeExists() {
+  return then2<String, Existence, FlutterWorld>(
+    'I wait until the (?:button|element|label|icon|field|text|widget) with type {string} is {existence}',
+    (ofType, existence, context) async {
+      await context.world.appDriver.waitUntil(
+        () async {
+          await context.world.appDriver.waitForAppToSettle();
+
+          return existence == Existence.absent
+              ? context.world.appDriver.isAbsent(
+                  context.world.appDriver.findBy(widgetTypeByName(ofType), FindType.type),
+                )
+              : context.world.appDriver.isPresent(
+                  context.world.appDriver.findBy(widgetTypeByName(ofType), FindType.type),
+                );
+        },
+      );
+    },
+  );
+}
+
+StepDefinitionGeneric ExpectTextToBePresent() {
+  return given2<String, int, FlutterWorld>(
+    RegExp(r'I expect the string {string} to be present within {int} second(s)$'),
+    (key, seconds, context) async {
+      await context.world.appDriver.waitUntil(
+        () async {
+          await context.world.appDriver.waitForAppToSettle();
+
+          return context.world.appDriver.isPresent(
+            context.world.appDriver.findBy(key, FindType.text),
+          );
+        },
+        timeout: Duration(seconds: seconds),
+      );
+    },
+    configuration: StepDefinitionConfiguration()..timeout = const Duration(days: 1),
+  );
+}
+
+StepDefinitionGeneric ExpectWidgetWithTextWithin() {
+  return given3<String, String, int, FlutterWorld>(
+    RegExp(r'I expect a {string} widget with text {string} to be present within {int} second(s)$'),
+    (widgetType, text, seconds, context) async {
+      await () async {
+        var result = false;
+        while (!result) {
+          await context.world.appDriver.waitForAppToSettle();
+
+          result = await context.world.appDriver.isPresent(
+            context.world.appDriver.findByDescendant(context.world.appDriver.findBy(widgetTypeByName(widgetType), FindType.type), context.world.appDriver.findBy(text, FindType.text)),
+          );
+        }
+      }()
+          .timeout(Duration(seconds: 120));
+    },
+    configuration: StepDefinitionConfiguration()..timeout = const Duration(days: 1),
+  );
+}
+
+StepDefinitionGeneric WaitUntilTextExists() {
+  return then2<String, Existence, FlutterWorld>(
+    'I wait until the text {string} is {existence}',
+    (text, existence, context) async {
+      await () async {
+        var result = false;
+        while (!result) {
+          await context.world.appDriver.waitForAppToSettle();
+
+          result = await (existence == Existence.absent
+              ? context.world.appDriver.isAbsent(
+                  context.world.appDriver.findBy(text, FindType.text),
+                )
+              : context.world.appDriver.isPresent(
+                  context.world.appDriver.findBy(text, FindType.text),
+                ));
+        }
+      }()
+          .timeout(Duration(seconds: 120));
+    },
+    configuration: StepDefinitionConfiguration()..timeout = const Duration(days: 1),
+  );
+}
+
+StepDefinitionGeneric WaitUntilTooltipExists() {
+  return then2<String, Existence, FlutterWorld>(
+    'I wait until the tooltip {string} is {existence}',
+    (ofType, existence, context) async {
+      await context.world.appDriver.waitUntil(
+        () async {
+          await context.world.appDriver.waitForAppToSettle();
+
+          return existence == Existence.absent
+              ? context.world.appDriver.isAbsent(
+                  context.world.appDriver.findBy(ofType, FindType.tooltip),
+                )
+              : context.world.appDriver.isPresent(
+                  context.world.appDriver.findBy(ofType, FindType.tooltip),
+                );
+        },
+        timeout: Duration(seconds: 120),
+      );
+    },
+    configuration: StepDefinitionConfiguration()..timeout = const Duration(days: 1),
+  );
+}
+
+mixin _SwipeHelper on When4WithWorld<SwipeDirection, int, String, String, FlutterWorld> {
+  Future<void> swipeOnFinder(
+    dynamic finder,
+    SwipeDirection direction,
+    int swipeAmount,
+  ) async {
+    if (direction == SwipeDirection.left || direction == SwipeDirection.right) {
+      final offset = direction == SwipeDirection.right ? swipeAmount : (swipeAmount * -1);
+      await world.appDriver.scroll(
+        finder,
+        dx: offset.toDouble(),
+        duration: Duration(milliseconds: 500),
+        timeout: timeout,
+      );
+    } else {
+      final offset = direction == SwipeDirection.up ? swipeAmount : (swipeAmount * -1);
+
+      await world.appDriver.scroll(
+        finder,
+        dy: offset.toDouble(),
+        duration: Duration(milliseconds: 500),
+        timeout: timeout,
+      );
+    }
+  }
+}
+
+class SwipeOnType extends When4WithWorld<SwipeDirection, int, String, String, FlutterWorld> with _SwipeHelper {
+  @override
+  Future<void> executeStep(
+    SwipeDirection direction,
+    int swipeAmount,
+    String typeOf,
+    String text,
+  ) async {
+    final finder = this.world.appDriver.findByDescendant(this.world.appDriver.findBy(widgetTypeByName(typeOf), FindType.type), this.world.appDriver.findBy(text, FindType.text));
+    await swipeOnFinder(finder, direction, swipeAmount);
+  }
+
+  @override
+  RegExp get pattern => RegExp(r'I swipe {swipe_direction} by {int} pixels on the widget of type {string} with text {string}');
+}
+
+Type widgetTypeByName(String input1) {
+  switch (input1) {
+    case "MessageBubble":
+      return MessageBubble;
+    case "ProfileMgrView":
+      return ProfileMgrView;
+    case "ProfileRow":
+      return ProfileRow;
+    case "TorIcon":
+      return TorIcon;
+    case "button":
+      return ElevatedButton;
+    case "IconButton":
+      return IconButton;
+    case "ProfileRow":
+      return ProfileRow;
+    default:
+      throw ("Unknown type $input1. add to integration_test/features/overrides.dart");
+  }
+}

integration_test/steps/text.dart

@@ -0,0 +1,47 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:flutter_gherkin/flutter_gherkin.dart';
+import 'package:gherkin/gherkin.dart';
+
+StepDefinitionGeneric TooltipTap() {
+  return given1<String, FlutterWorld>(RegExp(r'I tap the button with tooltip {string}'), (input1, context) async {
+    final finder = context.world.appDriver.findBy(input1, FindType.tooltip);
+    await context.world.appDriver.tap(finder);
+    await context.world.appDriver.waitForAppToSettle();
+  });
+}
+
+StepDefinitionGeneric TorVersionPresent() {
+  return given<FlutterWorld>(
+    RegExp(r'I expect the Tor version to be present$'),
+    (context) async {
+      String versionString = "";
+      final file = File('fetch-tor.sh');
+      Stream<String> lines = file.openRead().transform(utf8.decoder).transform(LineSplitter());
+      try {
+        await for (var line in lines) {
+          if (line.startsWith("wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-")) {
+            versionString = line.substring(81, 88);
+            break;
+          }
+        }
+        print('File is now closed.');
+      } catch (e) {
+        print('Error: $e');
+      }
+      if (versionString == "") {
+        context.expect(versionString, "#.#.#", reason: "error reading version string from fetch-tor.sh");
+        return;
+      }
+      context.world.attach(versionString, "text/plain", "Then I expect the Tor version to be present");
+      //context.reporter.message("test!!!", MessageLevel.info);
+      print("looking for version string $versionString");
+      final finder = context.world.appDriver.findBy(
+        versionString,
+        FindType.text,
+      );
+      final isP = await context.world.appDriver.isPresent(finder);
+      context.expect(isP, true);
+    },
+  );
+}