@

feat: add GitHub OAuth with PKCE and improve login UX

- Add GitHub OAuth login with PKCE (client_id + client_secret)
- Add loading dialog during OAuth token exchange
- Hide logout button when not logged in
- Swap button order: GitHub OAuth first (highlighted), Device Flow second
- Add clear code_verifier after use to prevent duplicate requests
- Fix handleOAuthCallback to skip if already logged in
@

Author: fjh1997

crates/hostsync-core/src/ffi.rs

@@ -311,7 +311,7 @@ mod android_jni {
     }
 
     #[no_mangle]
-    pub extern "system" fn Java_com_hostsync_app_MainActivity_hostsyncLogout(
+    pub extern "system" fn Java_com_hostsync_app_MainActivity_hostsyncLogoutNative(
         _env: JNIEnv,
         _class: JClass,
     ) -> jint {

crates/hostsync-core/src/storage.rs

@@ -118,7 +118,10 @@ pub fn save_github_state(state: &GithubState) -> std::io::Result<()> {
 }
 
 pub fn clear_github_state() -> std::io::Result<()> {
-    let _ = std::fs::remove_file(token_path());
+    let path = token_path();
+    if path.exists() {
+        std::fs::remove_file(&path)?;
+    }
     Ok(())
 }
 

mobile/android/app/src/main/AndroidManifest.xml

@@ -18,6 +18,16 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <!-- Handle OAuth callback: hostsync://oauth/callback?code=xxx -->
+            <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="hostsync"
+                    android:host="oauth"
+                    android:pathPrefix="/callback" />
+            </intent-filter>
         </activity>
 
         <activity android:name=".TerminalActivity" />

mobile/android/app/src/main/java/com/hostsync/app/AppLanguage.kt

@@ -77,6 +77,13 @@ data class AppStrings(
     val connectAnyway: String,
     val sync: String,
     val syncComplete: String,
+    val githubAppClientId: String,
+    val githubAppClientIdHint: String,
+    val loginWithGithubApp: String,
+    val loginWithBrowser: String,
+    val deviceFlow: String,
+    val loggingIn: String,
+    val loggingInDesc: String,
 ) {
     fun systemLanguageDetected(name: String): String {
         return when (language) {
@@ -188,6 +195,13 @@ object LanguagePrefs {
                 connectAnyway = "Connect Anyway",
                 sync = "Sync",
                 syncComplete = "Sync complete",
+                githubAppClientId = "GitHub App Client ID",
+                githubAppClientIdHint = "Enter Client ID from your GitHub App",
+                loginWithGithubApp = "Login with GitHub App",
+                loginWithBrowser = "Login with Browser",
+                deviceFlow = "Device Flow",
+                loggingIn = "Logging in...",
+                loggingInDesc = "Exchanging token with GitHub, please wait...",
             )
             AppLanguage.CHINESE -> AppStrings(
                 language = AppLanguage.CHINESE,
@@ -242,6 +256,13 @@ object LanguagePrefs {
                 connectAnyway = "仍然连接",
                 sync = "同步",
                 syncComplete = "同步完成",
+                githubAppClientId = "GitHub App Client ID",
+                githubAppClientIdHint = "输入你创建的 GitHub App 的 Client ID",
+                loginWithGithubApp = "使用 GitHub App 登录",
+                loginWithBrowser = "使用浏览器登录",
+                deviceFlow = "Device Flow",
+                loggingIn = "登录中...",
+                loggingInDesc = "正在与 GitHub 交换 token，请稍候...",
             )
         }
     }