Compare commits
No commits in common. "75b298b0f80c1c1768290c248efdbb810025004c" and "beeac586284dfca3a10df7a283d79a047ff39b43" have entirely different histories.
75b298b0f8
...
beeac58628
18 changed files with 314 additions and 302 deletions
14
.vscode/launch.json
vendored
14
.vscode/launch.json
vendored
|
|
@ -5,19 +5,19 @@
|
|||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Android Debug",
|
||||
"name": "Android",
|
||||
"type": "mono",
|
||||
"preLaunchTask": "run-debug-android",
|
||||
"request": "attach",
|
||||
"address": "localhost",
|
||||
"port": 55555
|
||||
"port": 10000
|
||||
},
|
||||
{
|
||||
"name": "Android Attach - Debug",
|
||||
"name": "Attach - Android",
|
||||
"type": "mono",
|
||||
"request": "attach",
|
||||
"address": "localhost",
|
||||
"port": 55555
|
||||
"port": 10000
|
||||
},
|
||||
{
|
||||
"name": "API",
|
||||
|
|
@ -26,19 +26,19 @@
|
|||
"projectPath": "${workspaceFolder}/src/Api/Api.csproj"
|
||||
},
|
||||
{
|
||||
"name": "Yavsc Org",
|
||||
"name": "Yavsc.Org",
|
||||
"type": "dotnet",
|
||||
"request": "launch",
|
||||
"projectPath": "${workspaceFolder}/src/Yavsc.Org/Yavsc.Org.csproj",
|
||||
},
|
||||
{
|
||||
"name": "Yavsc Blogs",
|
||||
"name": "Yavsc.Blogs",
|
||||
"type": "dotnet",
|
||||
"request": "launch",
|
||||
"projectPath": "${workspaceFolder}/src/Yavsc.Blogs/Yavsc.Blogs.csproj"
|
||||
},
|
||||
{
|
||||
"name": "PostIt Desktop",
|
||||
"name": "PostIt",
|
||||
"type": "dotnet",
|
||||
"request": "launch",
|
||||
"projectPath": "${workspaceFolder}/src/PostIt/PostIt.Desktop/PostIt.Desktop.csproj",
|
||||
|
|
|
|||
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
|
@ -5,7 +5,6 @@
|
|||
"appsettings",
|
||||
"asciidoctor",
|
||||
"ASPNETCORE",
|
||||
"Avalonia",
|
||||
"Configurabilité",
|
||||
"Cratie",
|
||||
"DESTDIR",
|
||||
|
|
@ -16,7 +15,6 @@
|
|||
"Hsts",
|
||||
"Newtonsoft",
|
||||
"Npgsql",
|
||||
"Oidc",
|
||||
"PKCE",
|
||||
"postit",
|
||||
"pschneider",
|
||||
|
|
|
|||
4
.vscode/tasks.json
vendored
4
.vscode/tasks.json
vendored
|
|
@ -18,8 +18,8 @@
|
|||
"-p:TargetFramework=net10.0-android",
|
||||
"-p:Configuration=Debug",
|
||||
"-p:AndroidAttachDebugger=true",
|
||||
"-p:AndroidSdbHostPort=55555",
|
||||
"-p:AndroidSdbTargetPort=55555"
|
||||
"-p:AndroidSdbHostPort=10000",
|
||||
"-p:AndroidSdbTargetPort=10000"
|
||||
],
|
||||
"problemMatcher": [
|
||||
{
|
||||
|
|
|
|||
171
Makefile
171
Makefile
|
|
@ -121,4 +121,173 @@ release:
|
|||
git push -u origin "$$BRANCH"; \
|
||||
echo "==> Terminé. Branche $$BRANCH live sur origin."
|
||||
|
||||
.PHONY: test release
|
||||
# Cibles pour installer PostIt.Android en Debug sur l'AVD qemu.
|
||||
#
|
||||
# Usage typique :
|
||||
# make qemu # lance l'AVD, attend le boot, build l'APK, l'installe
|
||||
# make android-install # (re)build l'APK et l'installe (AVD doit tourner)
|
||||
# make android-build # build l'APK seul (sans install)
|
||||
# make qemu-run # démarre l'AVD en background
|
||||
# make qemu-stop # arrête l'émulateur
|
||||
# make qemu-wait-boot # attend que l'AVD ait fini de booter
|
||||
#
|
||||
# Variables surchargeables (make VAR=valeur) :
|
||||
# AVD_NAME default: postit_test_avd
|
||||
# (l'AVD doit être listé par `avdmanager list avd`)
|
||||
# ADB_SERIAL default: emulator-5554
|
||||
# (port standard du premier émulateur lancé)
|
||||
# ANDROID_HOME default: /opt/android-sdk
|
||||
# (le SDK Android local; doit contenir
|
||||
# emulator/emulator et platform-tools/adb)
|
||||
# POSTIT_RID default: android-x64
|
||||
# (doit matcher l'ABI de l'AVD; `avdmanager list avd`
|
||||
# affiche la ligne Tag/ABI)
|
||||
# EMU_HEADLESS default: 0
|
||||
# (1 = lancer l'émulateur sans fenêtre, pour scripter)
|
||||
# CONFIG surcharge la variable CONFIG globale (Debug par
|
||||
# défaut dans ce Makefile). Passer à Release pour
|
||||
# un APK optimisé et signé release.
|
||||
# LOGCAT_LINES default: 200
|
||||
# (nombre de lignes dumpées par `make qemu-logcat`)
|
||||
# LOGCAT_FOLLOW default: 0
|
||||
# (1 = stream live via `make logcat`,
|
||||
# sinon dump one-shot des N dernières lignes)
|
||||
# LOGCAT_BOOT_WAIT default: 30
|
||||
# (secondes d'attente entre le clear du buffer,
|
||||
# le `am start`, et le dump final dans
|
||||
# `make qemu-logcat-boot`)
|
||||
AVD_NAME ?= postit_test_avd
|
||||
ADB_SERIAL ?= emulator-5554
|
||||
ANDROID_HOME ?= /opt/android-sdk
|
||||
POSTIT_RID ?= android-x64
|
||||
EMU_HEADLESS ?= 0
|
||||
LOGCAT_LINES ?= 600
|
||||
LOGCAT_FOLLOW ?= 0
|
||||
LOGCAT_BOOT_WAIT ?= 30
|
||||
|
||||
ANDROID_PACKAGE_NAME = fr.pschneider.postit
|
||||
POSTIT_ANDROID_CSPROJ := src/PostIt/PostIt.Android/PostIt.Android.csproj
|
||||
POSTIT_APK_DIR := src/PostIt/PostIt.Android/bin/$(CONFIG)/net10.0-android/$(POSTIT_RID)
|
||||
POSTIT_APK := $(POSTIT_APK_DIR)/$(ANDROID_PACKAGE_NAME)-Signed.apk
|
||||
|
||||
qemu-run:
|
||||
@echo " Starting AVD $(AVD_NAME) on $(ADB_SERIAL)..."
|
||||
@mkdir -p /tmp/yavsc-emu
|
||||
@EMU_ARGS=""; \
|
||||
if [ "$(EMU_HEADLESS)" = "1" ]; then EMU_ARGS="-no-window -no-audio"; fi; \
|
||||
$(ANDROID_HOME)/emulator/emulator -avd $(AVD_NAME) $$EMU_ARGS \
|
||||
>/tmp/yavsc-emu/$(AVD_NAME).log 2>&1 & \
|
||||
echo " emulator PID: $$!"
|
||||
|
||||
qemu-stop:
|
||||
adb -s $(ADB_SERIAL) emu kill
|
||||
|
||||
qemu-wait-boot:
|
||||
@echo " Waiting for $(ADB_SERIAL) to finish booting..."
|
||||
adb -s $(ADB_SERIAL) wait-for-device
|
||||
@for i in $$(seq 1 180); do \
|
||||
BOOTED=$$(adb -s $(ADB_SERIAL) shell getprop sys.boot_completed 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ "$$BOOTED" = "1" ]; then \
|
||||
echo " ✓ booted in $${i}s"; \
|
||||
exit 0; \
|
||||
fi; \
|
||||
sleep 1; \
|
||||
done; \
|
||||
echo " ERROR: device did not boot within 180s." >&2; \
|
||||
echo " Logs: /tmp/yavsc-emu/$(AVD_NAME).log" >&2; \
|
||||
exit 1
|
||||
|
||||
android-build:
|
||||
# EmbedAssembliesIntoApk=true: without this, the Debug APK ships
|
||||
# without the managed assemblies in it (they are pushed at runtime
|
||||
# via `adb push`, "Fast Deployment"). On the qemu emulator, the
|
||||
# runtime cannot find them in `files/.__override__/<rid>/` and
|
||||
# aborts at startup with "No assemblies found in '.__override__'"
|
||||
# (monodroid-glue.cc:757, SIGABRT). Forcing this property on
|
||||
# packages the .dlls into the APK as `assemblies/<rid>/` so the
|
||||
# runtime reads them directly.
|
||||
#
|
||||
# The Xamarin.Android SDK property is `EmbedAssembliesIntoApk`,
|
||||
# not `AndroidEnableFastDeployment` (which exists in older
|
||||
# templates but is a no-op in the .NET 10 SDK).
|
||||
dotnet build $(POSTIT_ANDROID_CSPROJ) \
|
||||
-c $(CONFIG) \
|
||||
-p:RuntimeIdentifier=$(POSTIT_RID) \
|
||||
-p:EmbedAssembliesIntoApk=true \
|
||||
--nologo
|
||||
@if [ ! -f "$(POSTIT_APK)" ]; then \
|
||||
echo " APK not found at $(POSTIT_APK)." >&2; \
|
||||
echo " Files in $(POSTIT_APK_DIR):" >&2; \
|
||||
ls -la "$(POSTIT_APK_DIR)" 2>/dev/null || echo " (directory does not exist)" >&2; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
|
||||
android-install: android-build
|
||||
@echo " Installing $(POSTIT_APK) on $(ADB_SERIAL)..."
|
||||
adb -s $(ADB_SERIAL) install -r "$(POSTIT_APK)" -r
|
||||
|
||||
qemu-uninstall:
|
||||
adb -s $(ADB_SERIAL) uninstall $(ANDROID_PACKAGE_NAME)
|
||||
|
||||
# Dump recent logcat output for the running PostIt.Android process.
|
||||
# By default, prints the last $(LOGCAT_LINES) lines (one-shot, with
|
||||
# `-d`). Set LOGCAT_FOLLOW=1 to follow the stream live instead.
|
||||
# Filtering is by PID (pidof $(ANDROID_PACKAGE_NAME)), not by tag,
|
||||
# because Mono/Xamarin can emit logs under several tags
|
||||
# (mono, PostIt.Android, Avalonia.Android) and tag-based filtering
|
||||
# would miss the ones not matching. PID-based filtering is exact.
|
||||
# If the app is not running, pidof returns empty and logcat exits
|
||||
# silently with no output; that is the expected behaviour for
|
||||
# "no logs yet".
|
||||
logcat:
|
||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ -z "$$PID" ]; then \
|
||||
echo " $(ANDROID_PACKAGE_NAME) is not running on $(ADB_SERIAL)."; \
|
||||
echo " Start the app first (am start -n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity)"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
echo " Following PID $$PID (LOGCAT_FOLLOW=$(LOGCAT_FOLLOW), LOGCAT_LINES=$(LOGCAT_LINES))"; \
|
||||
if [ "$(LOGCAT_FOLLOW)" = "1" ]; then \
|
||||
adb -s $(ADB_SERIAL) logcat -v time --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
||||
else \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
||||
fi
|
||||
|
||||
# Clear logcat, launch PostIt.Android, then dump everything that was
|
||||
# emitted during the startup window. Targets the "démarrage KO" case
|
||||
# where the process starts but Avalonia never renders a frame — the
|
||||
# logcat trace from process start to first frame is what diagnoses it.
|
||||
#
|
||||
# Override LOGCAT_BOOT_WAIT to extend the post-launch wait
|
||||
# (default 15s; raise to 30+ if the device is slow to boot Avalonia).
|
||||
LOGCAT_BOOT_WAIT ?= 15
|
||||
|
||||
|
||||
android-start:
|
||||
@echo " Clearing logcat buffer..."
|
||||
adb -s $(ADB_SERIAL) logcat -c
|
||||
@echo " Launching $(ANDROID_PACKAGE_NAME)..."
|
||||
adb -s $(ADB_SERIAL) shell am start \
|
||||
-n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity
|
||||
|
||||
qemu-logcat-boot: android-start
|
||||
@echo " Waiting $(LOGCAT_BOOT_WAIT)s for the app to start rendering..."
|
||||
@sleep $(LOGCAT_BOOT_WAIT)
|
||||
|
||||
@echo " Dumping logcat (PostIt PID + system buffer):"
|
||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ -n "$$PID" ]; then \
|
||||
echo " ✅ (PID $$PID at dump time)"; \
|
||||
sleep 10; \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID; \
|
||||
else \
|
||||
echo " 👿 (PostIt process not running at dump time — dumping last $(LOGCAT_LINES) lines unfiltered)"; \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES); \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
qemu: qemu-run qemu-wait-boot android-install
|
||||
@echo " ✓ PostIt.Android installed on $(ADB_SERIAL)"
|
||||
|
||||
.PHONY: test release qemu qemu-run qemu-stop qemu-wait-boot android-build android-install logcat qemu-logcat-boot
|
||||
|
|
|
|||
|
|
@ -1,178 +1,7 @@
|
|||
|
||||
# Cibles pour installer PostIt.Android en Debug sur l'AVD qemu.
|
||||
#
|
||||
# Usage typique :
|
||||
# make qemu # lance l'AVD, attend le boot, build l'APK, l'installe
|
||||
# make android-install # (re)build l'APK et l'installe (AVD doit tourner)
|
||||
# make android-build # build l'APK seul (sans install)
|
||||
# make qemu-run # démarre l'AVD en background
|
||||
# make qemu-stop # arrête l'émulateur
|
||||
# make qemu-wait-boot # attend que l'AVD ait fini de booter
|
||||
#
|
||||
# Variables surchargeables (make VAR=valeur) :
|
||||
# AVD_NAME default: postit_test_avd
|
||||
# (l'AVD doit être listé par `avdmanager list avd`)
|
||||
# ADB_SERIAL default: emulator-5554
|
||||
# (port standard du premier émulateur lancé)
|
||||
# ANDROID_HOME default: /opt/android-sdk
|
||||
# (le SDK Android local; doit contenir
|
||||
# emulator/emulator et platform-tools/adb)
|
||||
# POSTIT_RID default: android-x64
|
||||
# (doit matcher l'ABI de l'AVD; `avdmanager list avd`
|
||||
# affiche la ligne Tag/ABI)
|
||||
# EMU_HEADLESS default: 0
|
||||
# (1 = lancer l'émulateur sans fenêtre, pour scripter)
|
||||
# CONFIG surcharge la variable CONFIG globale (Debug par
|
||||
# défaut dans ce Makefile). Passer à Release pour
|
||||
# un APK optimisé et signé release.
|
||||
# LOGCAT_LINES default: 200
|
||||
# (nombre de lignes dumpées par `make qemu-logcat`)
|
||||
# LOGCAT_FOLLOW default: 0
|
||||
# (1 = stream live via `make logcat`,
|
||||
# sinon dump one-shot des N dernières lignes)
|
||||
# LOGCAT_BOOT_WAIT default: 30
|
||||
# (secondes d'attente entre le clear du buffer,
|
||||
# le `am start`, et le dump final dans
|
||||
# `make qemu-logcat-boot`)
|
||||
AVD_NAME ?= postit_test_avd
|
||||
ADB_SERIAL ?= emulator-5554
|
||||
ANDROID_HOME ?= /opt/android-sdk
|
||||
POSTIT_RID ?= android-x64
|
||||
EMU_HEADLESS ?= 0
|
||||
LOGCAT_LINES ?= 600
|
||||
LOGCAT_FOLLOW ?= 0
|
||||
LOGCAT_BOOT_WAIT ?= 30
|
||||
|
||||
ANDROID_PACKAGE_NAME = fr.pschneider.postit
|
||||
POSTIT_ANDROID_CSPROJ := PostIt.Android/PostIt.Android.csproj
|
||||
POSTIT_APK_DIR := PostIt.Android/bin/$(CONFIG)/net10.0-android/$(POSTIT_RID)
|
||||
POSTIT_APK := $(POSTIT_APK_DIR)/$(ANDROID_PACKAGE_NAME)-Signed.apk
|
||||
|
||||
clean: clean-PostIt clean-PostIt.Android clean-PostIt.Desktop
|
||||
|
||||
clean-%:
|
||||
rm -rf $*/obj $*/bin
|
||||
|
||||
qemu-run:
|
||||
@echo " Starting AVD $(AVD_NAME) on $(ADB_SERIAL)..."
|
||||
@mkdir -p /tmp/yavsc-emu
|
||||
@EMU_ARGS=""; \
|
||||
if [ "$(EMU_HEADLESS)" = "1" ]; then EMU_ARGS="-no-window -no-audio"; fi; \
|
||||
$(ANDROID_HOME)/emulator/emulator -avd $(AVD_NAME) $$EMU_ARGS \
|
||||
>/tmp/yavsc-emu/$(AVD_NAME).log 2>&1 & \
|
||||
echo " ✅ Started emulator PID: $$!"
|
||||
|
||||
qemu-stop:
|
||||
adb -s $(ADB_SERIAL) emu kill
|
||||
echo " ✅ Stopped emulator"
|
||||
|
||||
qemu-wait-boot:
|
||||
@echo " Waiting for $(ADB_SERIAL) to finish booting..."
|
||||
adb -s $(ADB_SERIAL) wait-for-device
|
||||
@for i in $$(seq 1 180); do \
|
||||
BOOTED=$$(adb -s $(ADB_SERIAL) shell getprop sys.boot_completed 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ "$$BOOTED" = "1" ]; then \
|
||||
echo " ✓ booted in $${i}s"; \
|
||||
exit 0; \
|
||||
fi; \
|
||||
sleep 1; \
|
||||
done; \
|
||||
echo " 👿 ERROR: device did not boot within 180s." >&2; \
|
||||
echo " Logs: /tmp/yavsc-emu/$(AVD_NAME).log" >&2; \
|
||||
exit 1
|
||||
|
||||
android-build:
|
||||
# EmbedAssembliesIntoApk=true: without this, the Debug APK ships
|
||||
# without the managed assemblies in it (they are pushed at runtime
|
||||
# via `adb push`, "Fast Deployment"). On the qemu emulator, the
|
||||
# runtime cannot find them in `files/.__override__/<rid>/` and
|
||||
# aborts at startup with "No assemblies found in '.__override__'"
|
||||
# (monodroid-glue.cc:757, SIGABRT). Forcing this property on
|
||||
# packages the .dlls into the APK as `assemblies/<rid>/` so the
|
||||
# runtime reads them directly.
|
||||
#
|
||||
# The Xamarin.Android SDK property is `EmbedAssembliesIntoApk`,
|
||||
# not `AndroidEnableFastDeployment` (which exists in older
|
||||
# templates but is a no-op in the .NET 10 SDK).
|
||||
dotnet build $(POSTIT_ANDROID_CSPROJ) \
|
||||
-c $(CONFIG) \
|
||||
-p:RuntimeIdentifier=$(POSTIT_RID) \
|
||||
-p:EmbedAssembliesIntoApk=true \
|
||||
--nologo
|
||||
@if [ ! -f "$(POSTIT_APK)" ]; then \
|
||||
echo " APK not found at $(POSTIT_APK)." >&2; \
|
||||
echo " Files in $(POSTIT_APK_DIR):" >&2; \
|
||||
ls -la "$(POSTIT_APK_DIR)" 2>/dev/null || echo " (directory does not exist)" >&2; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
|
||||
android-install: android-build
|
||||
@echo " Installing $(POSTIT_APK) on $(ADB_SERIAL)..."
|
||||
adb -s $(ADB_SERIAL) install -r "$(POSTIT_APK)" -r
|
||||
@echo " ✅ PostIt.Android installed on $(ADB_SERIAL)"
|
||||
|
||||
qemu-uninstall:
|
||||
adb -s $(ADB_SERIAL) uninstall $(ANDROID_PACKAGE_NAME)
|
||||
|
||||
# Dump recent logcat output for the running PostIt.Android process.
|
||||
# By default, prints the last $(LOGCAT_LINES) lines (one-shot, with
|
||||
# `-d`). Set LOGCAT_FOLLOW=1 to follow the stream live instead.
|
||||
# Filtering is by PID (pidof $(ANDROID_PACKAGE_NAME)), not by tag,
|
||||
# because Mono/Xamarin can emit logs under several tags
|
||||
# (mono, PostIt.Android, Avalonia.Android) and tag-based filtering
|
||||
# would miss the ones not matching. PID-based filtering is exact.
|
||||
# If the app is not running, pidof returns empty and logcat exits
|
||||
# silently with no output; that is the expected behaviour for
|
||||
# "no logs yet".
|
||||
logcat:
|
||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ -z "$$PID" ]; then \
|
||||
echo " $(ANDROID_PACKAGE_NAME) is not running on $(ADB_SERIAL)."; \
|
||||
echo " Start the app first (am start -n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity)"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
echo " Following PID $$PID (LOGCAT_FOLLOW=$(LOGCAT_FOLLOW), LOGCAT_LINES=$(LOGCAT_LINES))"; \
|
||||
if [ "$(LOGCAT_FOLLOW)" = "1" ]; then \
|
||||
adb -s $(ADB_SERIAL) logcat -v time --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
||||
else \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID $(ANDROID_PACKAGE_NAME); \
|
||||
fi
|
||||
|
||||
# Clear logcat, launch PostIt.Android, then dump everything that was
|
||||
# emitted during the startup window. Targets the "démarrage KO" case
|
||||
# where the process starts but Avalonia never renders a frame — the
|
||||
# logcat trace from process start to first frame is what diagnoses it.
|
||||
#
|
||||
# Override LOGCAT_BOOT_WAIT to extend the post-launch wait
|
||||
# (default 15s; raise to 30+ if the device is slow to boot Avalonia).
|
||||
LOGCAT_BOOT_WAIT ?= 15
|
||||
|
||||
|
||||
android-start:
|
||||
@echo " Clearing logcat buffer..."
|
||||
adb -s $(ADB_SERIAL) logcat -c
|
||||
@echo " Launching $(ANDROID_PACKAGE_NAME)..."
|
||||
adb -s $(ADB_SERIAL) shell am start \
|
||||
-n $(ANDROID_PACKAGE_NAME)/PostIt.Android.PostItMainActivity
|
||||
@echo " ✅ $(ANDROID_PACKAGE_NAME) started on $(ADB_SERIAL)"
|
||||
|
||||
qemu-logcat-boot: android-start
|
||||
@echo " Waiting $(LOGCAT_BOOT_WAIT)s for the app to start rendering..."
|
||||
@sleep $(LOGCAT_BOOT_WAIT)
|
||||
|
||||
@echo " Dumping logcat (PostIt PID + system buffer):"
|
||||
@PID=$$(adb -s $(ADB_SERIAL) shell pidof $(ANDROID_PACKAGE_NAME) 2>/dev/null | tr -d '\r\n'); \
|
||||
if [ -n "$$PID" ]; then \
|
||||
echo " ✅ (PID $$PID at dump time)"; \
|
||||
sleep 10; \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID; \
|
||||
else \
|
||||
echo " 👿 (PostIt process not running at dump time — dumping last $(LOGCAT_LINES) lines unfiltered)"; \
|
||||
adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES); \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
qemu: qemu-run qemu-wait-boot android-install
|
||||
|
||||
.PHONY: clean qemu qemu-run qemu-stop qemu-wait-boot android-build android-install logcat qemu-logcat-boot
|
||||
.PHONY: clean
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
|
||||
using Android;
|
||||
using Android.App;
|
||||
using Android.Content;
|
||||
using Android.Content.PM;
|
||||
using AndroidX.Core.Provider;
|
||||
using AndroidX.Emoji2.Text;
|
||||
using Avalonia;
|
||||
using Avalonia.Android;
|
||||
using PostIt.Droid.Services;
|
||||
using AndroidX.Core.Provider;
|
||||
using AndroidX.Emoji2.Text;
|
||||
|
||||
namespace PostIt.Android;
|
||||
|
||||
|
|
@ -32,7 +34,7 @@ public class MainActivity : AvaloniaMainActivity
|
|||
Yavsc.Resource.Array.com_google_android_gms_fonts_certs); //com_google_android_gms_fonts_certs
|
||||
EmojiCompat.Config config = new FontRequestEmojiCompatConfig(this, fontRequest);
|
||||
EmojiCompat.Init(config);
|
||||
PlatformBootstrap.InitPlatform();
|
||||
PlatformBootstrap.EnsureInitialized();
|
||||
base.OnCreate(savedInstanceState);
|
||||
Current = this;
|
||||
}
|
||||
|
|
@ -48,13 +50,7 @@ public class MainActivity : AvaloniaMainActivity
|
|||
protected override void OnNewIntent(Intent? intent)
|
||||
{
|
||||
base.OnNewIntent(intent);
|
||||
|
||||
var url = intent?.DataString;
|
||||
if (!string.IsNullOrEmpty(url) && url.StartsWith("postit://callback"))
|
||||
{
|
||||
OidcCallbackManager.SetResult(url);
|
||||
}
|
||||
|
||||
if (intent is not null) AndroidOidcCallbackSink.Handle(intent);
|
||||
}
|
||||
|
||||
internal static class AndroidOidcCallbackSink
|
||||
|
|
|
|||
|
|
@ -12,9 +12,14 @@ namespace PostIt.Android;
|
|||
/// </summary>
|
||||
internal static class PlatformBootstrap
|
||||
{
|
||||
internal static void InitPlatform()
|
||||
{
|
||||
private static int _initialized;
|
||||
|
||||
internal static void EnsureInitialized()
|
||||
{
|
||||
if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
|
||||
return;
|
||||
|
||||
Platform.DefaultRedirectUri = ViewModels.Settings.AndroidRedirectUri;
|
||||
Platform.CreateBrowser = () =>
|
||||
{
|
||||
var activity = MainActivity.Current;
|
||||
|
|
|
|||
|
|
@ -2,5 +2,31 @@
|
|||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<application android:label="PostIt" android:icon="@drawable/Icon">
|
||||
|
||||
<!--
|
||||
Deep-link receiver for the OIDC Authorization Code + PKCE flow.
|
||||
After the user authenticates in the system browser, the OP
|
||||
redirects to android://postit-signin?... and Android forwards
|
||||
the Intent to the MainActivity (configured SingleTask so the
|
||||
existing instance receives OnNewIntent rather than spawning a
|
||||
new one).
|
||||
|
||||
The host value (postit-signin) MUST match the
|
||||
AndroidRedirectUri constant in PostIt/Settings/Settings.cs and
|
||||
the corresponding RedirectUri registered for the 'postit'
|
||||
client in IdentityServer (Yavsc.Org ConfigurationDb).
|
||||
-->
|
||||
<activity-alias
|
||||
android:name="PostIt.Android.OidcCallbackActivity"
|
||||
android:targetActivity="PostIt.Android.PostItMainActivity"
|
||||
android:exported="true"
|
||||
android:launchMode="singleTask">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="android" android:host="postit-signin" />
|
||||
</intent-filter>
|
||||
</activity-alias>
|
||||
</application>
|
||||
</manifest>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ using System.Threading.Tasks;
|
|||
using Android.App;
|
||||
using AndroidX.Browser.CustomTabs;
|
||||
using IdentityModel.OidcClient.Browser;
|
||||
using PostIt.Droid.Services;
|
||||
|
||||
namespace PostIt.Android.Services;
|
||||
|
||||
|
|
@ -36,15 +35,10 @@ public sealed class AndroidSystemBrowser : IBrowser
|
|||
};
|
||||
}
|
||||
|
||||
// 1. Enregistrez la tâche avant de lancer le Custom Tab
|
||||
var callbackTask = OidcCallbackManager.RegisterCallback(cancellationToken);
|
||||
|
||||
// 2. LANCEZ VOTRE CUSTOM TAB ICI (via AndroidX.Browser.CustomTabs)
|
||||
// ... code pour ouvrir l'URL d'authentification ...
|
||||
|
||||
|
||||
var uri = global::Android.Net.Uri.Parse(options.StartUrl)!;
|
||||
|
||||
var callbackTask = MainActivity.AndroidOidcCallbackSink.AwaitNextCallbackAsync();
|
||||
|
||||
var tabsIntent = new CustomTabsIntent.Builder()
|
||||
.SetShowTitle(true)!
|
||||
.Build();
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace PostIt.Droid.Services;
|
||||
|
||||
public static class OidcCallbackManager
|
||||
{
|
||||
private static TaskCompletionSource<string>? _tcs;
|
||||
|
||||
public static Task<string> RegisterCallback(CancellationToken cancellationToken)
|
||||
{
|
||||
_tcs = new TaskCompletionSource<string>();
|
||||
cancellationToken.Register(() => _tcs.TrySetCanceled());
|
||||
return _tcs.Task;
|
||||
}
|
||||
|
||||
public static void SetResult(string url)
|
||||
{
|
||||
_tcs?.TrySetResult(url);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
using Android.App;
|
||||
using Android.Content;
|
||||
using Android.Content.PM;
|
||||
using Android.OS;
|
||||
using PostIt.Droid.Services;
|
||||
|
||||
namespace PostIt.Android;
|
||||
|
||||
[Activity(NoHistory = true, LaunchMode = LaunchMode.SingleTop, Exported = true)]
|
||||
[IntentFilter(new[] { Intent.ActionView },
|
||||
Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable },
|
||||
DataScheme = "postit", // Remplacez par votre schéma personnalisé (ex: yavsc ou postit)
|
||||
DataHost = "callback")] // Correspond à postit://callback
|
||||
public class WebAuthenticationCallbackActivity : Activity
|
||||
{
|
||||
protected override void OnCreate(Bundle? savedInstanceState)
|
||||
{
|
||||
base.OnCreate(savedInstanceState);
|
||||
|
||||
// Capturer l'URL de redirection OIDC
|
||||
var url = Intent?.DataString;
|
||||
|
||||
if (!string.IsNullOrEmpty(url))
|
||||
{
|
||||
// Transmettre l'URL au gestionnaire partagé pour compléter la Task
|
||||
OidcCallbackManager.SetResult(url);
|
||||
}
|
||||
|
||||
// Fermer cette activité transparente et ramener l'application au premier plan
|
||||
var intent = new Intent(this, typeof(MainActivity));
|
||||
intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);
|
||||
StartActivity(intent);
|
||||
Finish();
|
||||
}
|
||||
}
|
||||
29
src/PostIt/PostIt.Desktop/PlatformBootstrap.cs
Normal file
29
src/PostIt/PostIt.Desktop/PlatformBootstrap.cs
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
using PostIt.Services;
|
||||
|
||||
namespace PostIt.Desktop;
|
||||
|
||||
/// <summary>
|
||||
/// One-shot platform bootstrap. Called from <c>Program.Main</c> so that
|
||||
/// the shared OIDC login path sees a working <c>IBrowser</c> — the
|
||||
/// custom-scheme browser that hands the OIDC callback off to the
|
||||
/// running instance through the named pipe. Desktop builds do NOT use
|
||||
/// a loopback HTTP listener: the <c>postit://</c> scheme is registered
|
||||
/// with the OS at install time and the browser is whatever the user
|
||||
/// has configured to open it.
|
||||
/// </summary>
|
||||
internal static class PlatformBootstrap
|
||||
{
|
||||
private static int _initialized;
|
||||
|
||||
internal static void EnsureInitialized()
|
||||
{
|
||||
if (System.Threading.Interlocked.Exchange(ref _initialized, 1) != 0)
|
||||
return;
|
||||
|
||||
// Use the custom-scheme redirect on Desktop. Loopback is only
|
||||
// a fallback for platforms that cannot register postit://
|
||||
// (see Settings.DefaultLoopbackRedirectUri for that path).
|
||||
Platform.DefaultRedirectUri = AuthenticationSettings.DefaultDesktopRedirectUri;
|
||||
Platform.CustomScheme = "postit";
|
||||
}
|
||||
}
|
||||
|
|
@ -12,6 +12,8 @@ sealed class Program
|
|||
[STAThread]
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
PlatformBootstrap.EnsureInitialized();
|
||||
|
||||
// Short-circuit 2nd-instance launches (OS handing us the
|
||||
// postit://callback URL) BEFORE Avalonia spins up a window.
|
||||
// If we let Avalonia initialise, the new MainWindow flashes
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ public class SettingsLoadTests
|
|||
bool flip = ((workerId + i) & 1) == 0;
|
||||
settings.DarkMode = flip;
|
||||
settings.Authentication.RedirectUri =
|
||||
global::AuthenticationSettings.DesktopRedirectUri;
|
||||
global::AuthenticationSettings.DefaultDesktopRedirectUri;
|
||||
|
||||
settings.BusinessApiUrl = flip
|
||||
? "https://a.example.test/api/v1/"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
|
|
@ -43,15 +44,27 @@ public partial class App : Application
|
|||
|
||||
this.ServiceProvider = new ServiceCollection().BuildServices();
|
||||
var settings = ServiceProvider.GetRequiredService<Settings>();
|
||||
var sessionStatus = ServiceProvider!.GetRequiredService<SessionStatusViewModel>();
|
||||
sessionStatus.LogoutCompleted += () =>
|
||||
{
|
||||
View.NavRoot.PopToRootAsync();
|
||||
};
|
||||
|
||||
sessionStatus.LoginSucceeded += () =>
|
||||
{
|
||||
PushMainPageAsync();
|
||||
};
|
||||
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
|
||||
{
|
||||
var window = ServiceProvider.GetRequiredService<MainWindow>();
|
||||
desktop.MainWindow = window;
|
||||
var api = ServiceProvider!.GetRequiredService<YavscApiClient>();
|
||||
desktop.MainWindow.Opened += async (_, _) => await BootAsync(this.ServiceProvider!, api);
|
||||
|
||||
View = window.MainView;
|
||||
this.ConfigureRootView(window.MainView);
|
||||
|
||||
View.SessionBanner.DataContext = sessionStatus;
|
||||
// FIXME Window.Opened += async (_, _) => await BootAsync(this.ServiceProvider!, api);
|
||||
|
||||
ApplyDarkMode(settings);
|
||||
}
|
||||
|
|
@ -61,42 +74,23 @@ public partial class App : Application
|
|||
() =>
|
||||
{
|
||||
View = ServiceProvider.GetRequiredService<MainView>();
|
||||
this.ConfigureRootView(View);
|
||||
ApplyDarkMode(settings);
|
||||
View.SessionBanner.DataContext = sessionStatus;
|
||||
return View;
|
||||
};
|
||||
}
|
||||
else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform)
|
||||
{
|
||||
singleViewPlatform.MainView = View = ServiceProvider.GetRequiredService<MainView>();
|
||||
ConfigureRootView(View);
|
||||
View.SessionBanner.DataContext = sessionStatus;
|
||||
ApplyDarkMode(settings);
|
||||
}
|
||||
var mainVm = ServiceProvider!.GetRequiredService<HomePageViewModel>();
|
||||
|
||||
base.OnFrameworkInitializationCompleted();
|
||||
this.PushPageAsync(mainVm);
|
||||
}
|
||||
|
||||
private void ConfigureRootView(MainView rootView)
|
||||
{
|
||||
var api = ServiceProvider!.GetRequiredService<YavscApiClient>();
|
||||
|
||||
// Déclencher le Boot lors du chargement du contrôle à l'écran
|
||||
rootView.AttachedToVisualTree += async (_, _) => await BootAsync(this.ServiceProvider!, api);
|
||||
|
||||
var sessionStatus = ServiceProvider!.GetRequiredService<SessionStatusViewModel>();
|
||||
sessionStatus.LogoutCompleted += () =>
|
||||
{
|
||||
// Remplacer Window.NavRoot par rootView.NavRoot
|
||||
rootView.NavRoot.PopToRootAsync();
|
||||
};
|
||||
|
||||
sessionStatus.LoginSucceeded += async () =>
|
||||
{
|
||||
await PushMainPageAsync();
|
||||
};
|
||||
|
||||
rootView.SessionBanner.DataContext = sessionStatus;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Test-only hook: bind a concrete <see cref="MainView"/> so
|
||||
|
|
@ -130,9 +124,6 @@ private void ConfigureRootView(MainView rootView)
|
|||
var refreshed = await api.TrySilentLoginAsync().ConfigureAwait(true);
|
||||
var sessionStatus = provider.GetRequiredService<SessionStatusViewModel>();
|
||||
sessionStatus.Refresh();
|
||||
var homePage = provider.GetRequiredService<HomePageViewModel>();
|
||||
var app = (App)Current!;
|
||||
await app.PushPageAsync(homePage);
|
||||
if (!refreshed) return;
|
||||
|
||||
await PushMainPageAsync().ConfigureAwait(true);
|
||||
|
|
|
|||
|
|
@ -21,14 +21,14 @@ public static class Platform
|
|||
/// override this property at startup (e.g. PostIt.Android sets
|
||||
/// it to <c>android://postit-signin</c>).
|
||||
/// </summary>
|
||||
public const string RedirectUri = "postit://callback";
|
||||
public static string DefaultRedirectUri { get; set; } = "postit://callback";
|
||||
|
||||
/// <summary>
|
||||
/// Scheme prefix the <see cref="CustomSchemeBrowser"/> matches
|
||||
/// against <c>BrowserOptions.EndUrl</c>. Overridable for apps
|
||||
/// that want to register their own scheme.
|
||||
/// </summary>
|
||||
public const string CustomScheme = "postit";
|
||||
public static string CustomScheme { get; set; } = "postit";
|
||||
|
||||
/// <summary>
|
||||
/// Constructs a fresh <see cref="IBrowser"/> for the running platform.
|
||||
|
|
@ -37,4 +37,4 @@ public static class Platform
|
|||
/// </summary>
|
||||
public static System.Func<IBrowser?>? CreateBrowser { get; set; } =
|
||||
() => new CustomSchemeBrowser(CustomScheme);
|
||||
}
|
||||
}
|
||||
|
|
@ -10,7 +10,7 @@ public partial class AuthenticationSettings : ObservableObject
|
|||
/// hand-off in <see cref="PostIt.Services.SingleInstance"/>
|
||||
/// (RFC 8252 §7.1). Production Desktop builds use this.
|
||||
/// </summary>
|
||||
public const string DesktopRedirectUri = "postit://callback";
|
||||
public const string DefaultDesktopRedirectUri = "postit://callback";
|
||||
|
||||
/// <summary>
|
||||
/// Redirect URI used by the Android app. The corresponding IntentFilter
|
||||
|
|
@ -34,19 +34,15 @@ public partial class AuthenticationSettings : ObservableObject
|
|||
[ObservableProperty]
|
||||
public partial string[] Scopes { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// OAuth redirect URI. Defaults to <see cref="DesktopRedirectUri"/>
|
||||
/// OAuth redirect URI. Defaults to <see cref="DefaultDesktopRedirectUri"/>
|
||||
/// (custom URI scheme) which is the right answer for desktop
|
||||
/// production builds. Mobile platforms must set this to
|
||||
/// <see cref="AndroidRedirectUri"/> before calling <c>LoginAsync</c>.
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
public partial string RedirectUri { get; set; }
|
||||
#if ANDROID
|
||||
= AndroidRedirectUri;
|
||||
#else
|
||||
= DesktopRedirectUri;
|
||||
#endif
|
||||
public partial string RedirectUri { get; set; } = DefaultDesktopRedirectUri;
|
||||
|
||||
/// <summary>
|
||||
/// Space-separated view of <see cref="Scopes"/>. Exists for the
|
||||
|
|
|
|||
|
|
@ -2,11 +2,13 @@ using System.Runtime.CompilerServices;
|
|||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using IdentityModel.OidcClient;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
using System.Text.Json;
|
||||
using System.Threading;
|
||||
|
||||
[assembly: InternalsVisibleTo("PostIt.Tests")]
|
||||
|
||||
|
|
@ -16,6 +18,37 @@ public partial class Settings : ViewModelBase
|
|||
{
|
||||
const string SettingsFileName = "postit-settings.json";
|
||||
|
||||
/// <summary>
|
||||
/// Redirect URI used by the Android app. The corresponding IntentFilter
|
||||
/// in <c>PostIt.Android/Properties/AndroidManifest.xml</c> must match.
|
||||
/// </summary>
|
||||
public const string AndroidRedirectUri = "android://postit-signin";
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Process-wide canonical <see cref="Settings"/> instance, wired up
|
||||
/// at application boot by <see cref="App.OnFrameworkInitializationCompleted"/>
|
||||
/// through <see cref="BindToServiceProvider"/>. The hybrid pattern:
|
||||
/// <list type="bullet">
|
||||
/// <item><description>The static <c>Current</c> reference gives
|
||||
/// ViewModels a non-DI way to reach the same instance (and lets
|
||||
/// the framework bindings push notifications through one stable
|
||||
/// <see cref="ObservableObject"/>).</description></item>
|
||||
/// <item><description>Tests that want to exercise a clean
|
||||
/// instance still call <c>new Settings()</c>; <c>Current</c>
|
||||
/// stays null in those contexts because <see cref="BindToServiceProvider"/>
|
||||
/// is never invoked.</description></item>
|
||||
/// <item><description>Reads (<see cref="GetCurrent"/>) are
|
||||
/// thread-safe and never allocate; mutations always go through
|
||||
/// the DI-resolved singleton so two threads cannot each register
|
||||
/// a different "current" Settings.</description></item>
|
||||
/// </list>
|
||||
/// </summary>
|
||||
private static Settings? s_current;
|
||||
|
||||
|
||||
|
||||
[ObservableProperty]
|
||||
public partial AuthenticationSettings Authentication { get; set; } = new();
|
||||
|
||||
|
|
@ -33,7 +66,7 @@ public partial class Settings : ViewModelBase
|
|||
/// setters above all funnel through here, and we flip
|
||||
/// <see cref="IsDirty"/> in lock-step. Sub-property mutations
|
||||
/// (e.g. <c>Authentication.Authority</c>) are caught by the
|
||||
/// subscription wired up in
|
||||
/// subscription wired up in
|
||||
/// below. <see cref="ApplyJson"/> disables the flag during bulk
|
||||
/// hydration so the disk load itself does not count as a user
|
||||
/// edit.
|
||||
|
|
@ -303,7 +336,7 @@ public partial class Settings : ViewModelBase
|
|||
this.Authentication.ClientId = string.IsNullOrWhiteSpace(settings.Authentication.ClientId) ?
|
||||
AuthenticationSettings.DefaultClientId : settings.Authentication.ClientId;
|
||||
this.Authentication.RedirectUri = string.IsNullOrWhiteSpace(settings.Authentication.RedirectUri) ?
|
||||
AuthenticationSettings.DesktopRedirectUri : settings.Authentication.RedirectUri;
|
||||
AuthenticationSettings.DefaultDesktopRedirectUri : settings.Authentication.RedirectUri;
|
||||
if (settings.Authentication.Scopes is null || settings.Authentication.Scopes.Length == 0)
|
||||
{
|
||||
settings.Authentication.Scopes = AuthenticationSettings.DefaultScopes;
|
||||
|
|
@ -344,7 +377,7 @@ public partial class Settings : ViewModelBase
|
|||
{
|
||||
Authority = AuthenticationSettings.DefaultAuthority,
|
||||
ClientId = AuthenticationSettings.DefaultClientId,
|
||||
RedirectUri = AuthenticationSettings.DesktopRedirectUri,
|
||||
RedirectUri = AuthenticationSettings.DefaultDesktopRedirectUri,
|
||||
Scopes = AuthenticationSettings.DefaultScopes
|
||||
};
|
||||
this.DarkMode = false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue