android/app/build.gradle

@@ -39,11 +39,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        // do we want to update.. eventually?
-        jvmTarget = "17"
-    }
-
     defaultConfig {
         applicationId = "nexus.federated.Nexus"
         minSdk = 29
@@ -55,8 +50,7 @@ android {
 	signingConfigs {
 		release {
 			keyAlias "key"
-			def storePath = keystoreProperties['path'] ?: System.getenv("KEYSTORE_PATH")
+			storeFile keystoreProperties['path'] ? file(keystoreProperties['path']) : file(System.getenv("KEYSTORE_PATH"))
-			storeFile storePath ? file(storePath) : null
 			keyPassword keystoreProperties['password'] ?: System.getenv("KEYSTORE_PASSWORD")
 			storePassword keystoreProperties['password'] ?: System.getenv("KEYSTORE_PASSWORD")
 		}

android/app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
         android:label="Nexus"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/nexus_round"
 		android:allowBackup="false"
     	android:fullBackupContent="false">
         <activity

flake.nix

@@ -33,6 +33,7 @@
           _module.args.pkgs = import nixpkgs {
             inherit system;
             config = {
+              permittedInsecurePackages = [ "olm-3.2.16" ];
               android_sdk.accept_license = true;
               allowUnfree = true;
             };
@@ -42,6 +43,7 @@
             let
               packages = with pkgs; [
                 go
+                olm
                 git
               ];
 

hook/build.dart

@@ -6,12 +6,8 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
   final buildDir = input.packageRoot.resolve("src/");
   if (await File(buildDir.resolve("lock").toFilePath()).exists()) return;
 
-  final codeConfig = input.config.code;
+  final targetOS = input.config.code.targetOS;
-  final targetOS = codeConfig.targetOS;
-  final targetArch = codeConfig.targetArchitecture;
-
   String libFileName;
-  Map<String, String> env = {};
   switch (targetOS) {
     case OS.linux:
       libFileName = "libgomuks.so";
@@ -22,51 +18,20 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
     case OS.windows:
       libFileName = "libgomuks.dll";
       break;
-    case OS.android:
-      libFileName = "libgomuks.so";
-
-      final targetNdkApi = codeConfig.android.targetNdkApi;
-
-      final ndkHome = Platform.environment["ANDROID_NDK_HOME"]
-          ?? Platform.environment["ANDROID_NDK_ROOT"]
-          ?? Platform.environment["NDK_HOME"]
-          ?? await _findNdkFromSdk();
-      if (ndkHome == null) {
-        throw Exception(
-          "Could not find Android NDK. Set ANDROID_NDK_HOME or install via sdkmanager.",
-        );
-      }
-
-      final hostTag = _ndkHostTag();
-      final (goArch, ccTriple) = _androidArch(targetArch);
-      final cc = "$ndkHome/toolchains/llvm/prebuilt/$hostTag/bin/$ccTriple$targetNdkApi-clang";
-
-      env = {
-        "CGO_ENABLED": "1",
-        "GOOS": "android",
-        "GOARCH": goArch,
-        "CC": cc,
-      };
-      break;
     default:
       throw UnsupportedError("Unsupported OS: $targetOS");
   }
 
   final gomuksBuildDir = buildDir.resolve("gomuks/");
-  final libFile = gomuksBuildDir.resolve("${targetArch.name}/$libFileName");
+  final libFile = gomuksBuildDir.resolve(libFileName);
 
-  // goheif/dav1d supported on Android would need to fix upstream
+  print("Building Gomuks shared library $libFileName from source...");
-  final tags = targetOS == OS.android ? "goolm,noheic" : "goolm";
-
-  print("Building Gomuks shared library $libFileName (${targetOS.name}/${targetArch.name}) from source...");
   final result = await Process.run("go", [
     "build",
-    "-tags", tags,
     "-o",
     libFile.path,
     "-buildmode=c-shared",
-  ], workingDirectory: gomuksBuildDir.resolve("source/pkg/ffi/").toFilePath(),
+  ], workingDirectory: gomuksBuildDir.resolve("source/pkg/ffi/").toFilePath());
-     environment: env.isNotEmpty ? env : null);
 
   if (result.exitCode != 0) {
     throw Exception("Failed to build Gomuks shared library\n${result.stderr}");
@@ -87,42 +52,3 @@ Future<void> main(List<String> args) => build(args, (input, output) async {
     ..dependencies.add(gomuksBuildDir);
   print("Done!");
 });
-
-Future<String?> _findNdkFromSdk() async {
-  // pretty sure this wont be needed with nix, i'll get this removed
-  final androidHome = Platform.environment["ANDROID_HOME"]
-      ?? Platform.environment["ANDROID_SDK_ROOT"];
-  if (androidHome == null) return null;
-  final ndkDir = Directory("$androidHome/ndk");
-  if (!await ndkDir.exists()) return null;
-  final versions = await ndkDir.list().toList();
-  if (versions.isEmpty) return null;
-  versions.sort((a, b) => a.path.compareTo(b.path));
-  return versions.last.path;
-}
-
-String _ndkHostTag() {
-  if (Platform.isMacOS) {
-    return "darwin-x86_64";
-  } else if (Platform.isLinux) {
-    return "linux-x86_64";
-  } else if (Platform.isWindows) {
-    return "windows-x86_64";
-  }
-  throw UnsupportedError("Unsupported host platform for Android NDK");
-}
-
-(String goArch, String ccTriple) _androidArch(Architecture arch) {
-  switch (arch) {
-    case Architecture.arm64:
-      return ("arm64", "aarch64-linux-android");
-    case Architecture.arm:
-      return ("arm", "armv7a-linux-androideabi");
-    case Architecture.x64:
-      return ("amd64", "x86_64-linux-android");
-    case Architecture.ia32:
-      return ("386", "i686-linux-android");
-    default:
-      throw UnsupportedError("Unsupported Android architecture: $arch");
-  }
-}

lib/main.dart

@@ -59,17 +59,15 @@ void showError(Object error, [StackTrace? stackTrace]) {
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
-  if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
+  await windowManager.ensureInitialized();
-    await windowManager.ensureInitialized();
+  await windowManager.waitUntilReadyToShow(
-    await windowManager.waitUntilReadyToShow(
+    WindowOptions(titleBarStyle: TitleBarStyle.hidden),
-      WindowOptions(titleBarStyle: TitleBarStyle.hidden),
+  );
-    );
 
-    if (Platform.isLinux) {
+  if (Platform.isLinux) {
-      setWindowMinSize(const Size.square(500));
+    setWindowMinSize(const Size.square(500));
-    } else {
+  } else {
-      await windowManager.setMinimumSize(Size.square(500));
+    await windowManager.setMinimumSize(Size.square(500));
-    }
   }
 
   FlutterError.onError = (FlutterErrorDetails details) =>