diff --git a/.gitignore b/.gitignore index c0e6a9b..261f60b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ node_modules releases .fallow .direnv +keystore.jks +keystore.properties diff --git a/apps/tauri/.gitignore b/apps/tauri/.gitignore index dc67136..8952e07 100644 --- a/apps/tauri/.gitignore +++ b/apps/tauri/.gitignore @@ -24,6 +24,3 @@ dist-ssr *.sw? .android - -/src-tauri/gen/android/keystore.properties -/src-tauri/gen/android/keystore.jks diff --git a/apps/tauri/src-tauri/gen/android/app/src/main/java/net/tensamin/client/MainActivity.kt b/apps/tauri/src-tauri/gen/android/app/src/main/java/net/tensamin/client/MainActivity.kt index ba57286..a69f0c8 100644 --- a/apps/tauri/src-tauri/gen/android/app/src/main/java/net/tensamin/client/MainActivity.kt +++ b/apps/tauri/src-tauri/gen/android/app/src/main/java/net/tensamin/client/MainActivity.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.view.ViewGroup import android.view.ViewTreeObserver import android.view.WindowManager +import android.webkit.WebView import android.widget.FrameLayout import androidx.core.view.ViewCompat import androidx.core.view.WindowCompat @@ -16,6 +17,10 @@ class MainActivity : TauriActivity() { private var previousUsableHeight = 0 private var attachLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null + override fun onWebViewCreate(webView: WebView) { + webView.setInitialScale(300) + } + override fun onCreate(savedInstanceState: Bundle?) { WindowCompat.setDecorFitsSystemWindows(window, true) window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING) diff --git a/package.json b/package.json index 8840203..c3da492 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "start-adb:mobile": "cd apps/tauri && pnpm run start-adb:mobile", "dev:desktop": "cd apps/electron && pnpm run dev", "build:desktop": "cd apps/electron && pnpm run package", - "delete:mobile": "cd apps/tauri && nix develop ../..#tauri --command adb uninstall net.tensamin.client" + "delete:mobile": "cd apps/tauri && nix develop ../..#tauri --command adb uninstall net.tensamin.client.dev" }, "devDependencies": { "@eslint/js": "^10.0.1", diff --git a/packages/cache/src/sync.tsx b/packages/cache/src/sync.tsx index 9477b8b..f90e80d 100644 --- a/packages/cache/src/sync.tsx +++ b/packages/cache/src/sync.tsx @@ -142,6 +142,7 @@ export default function CacheSync() { MessageState: "sent", SenderId: accountId, SendTime: Number(request.SendTime), + ReplyId: request.ReplyId ? Number(request.ReplyId) : undefined, }); return; } diff --git a/packages/chat/src/components/input.tsx b/packages/chat/src/components/input.tsx index 2b64099..1dc336f 100644 --- a/packages/chat/src/components/input.tsx +++ b/packages/chat/src/components/input.tsx @@ -112,6 +112,7 @@ export default function InputComponent({ Content: encryptedContent, ReceiverId: userId, SendTime: time, + ...(replyTo && { ReplyId: replyTo }), }).catch((e) => { log(0, "Chat", "red", "Failed to send message", e, { ReceiverId: userId, diff --git a/packages/chat/src/screen.tsx b/packages/chat/src/screen.tsx index bf3a1cf..f30b9f8 100644 --- a/packages/chat/src/screen.tsx +++ b/packages/chat/src/screen.tsx @@ -487,7 +487,7 @@ export default function Screen() { } + loading={null} component={(user) => (