Merge branch 'feature/tv-ascii-captcha' into 'develop'

feat: Add ASCII captcha support for TV login and signup flows

See merge request ws/client/androidapp!329

Author: Ginder-Singh

CLAUDE.md

@@ -0,0 +1,113 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Build Commands
+
+### Building the App
+```bash
+./gradlew assembleDebug          # Build debug APK
+./gradlew assembleRelease        # Build release APK
+./gradlew bundleGoogleRelease    # Build Google Play AAB
+./gradlew bundleFdroidRelease    # Build F-Droid AAB
+```
+
+### Testing
+```bash
+./gradlew test                   # Run unit tests
+./gradlew connectedAndroidTest   # Run instrumented tests
+./gradlew testDebug             # Run debug unit tests
+```
+
+### Code Quality
+```bash
+./gradlew ktlintCheck           # Check Kotlin code style
+./gradlew ktlintFormat          # Format Kotlin code
+./gradlew dependencyCheckAnalyze # Security dependency analysis
+```
+
+### Cleaning
+```bash
+./gradlew clean                 # Clean build artifacts
+```
+
+## Project Architecture
+
+### Module Structure
+- **base/**: Core VPN logic, database, networking, and shared components
+- **mobile/**: Android phone/tablet UI implementation
+- **tv/**: Android TV interface implementation
+- **openvpn/**: OpenVPN protocol implementation
+- **strongswan/**: IKEv2/IPSec protocol implementation
+- **wgtunnel/**: WireGuard tunnel implementation
+- **common/**: Shared utilities and common code
+- **test/**: Shared test utilities and mocks
+
+### Application Classes
+- **Windscribe** (base): Main application class with dependency injection
+- **PhoneApplication** (mobile): Mobile-specific implementation
+- **TVApplication** (tv): TV-specific implementation
+
+### Key Technologies
+- **Dependency Injection**: Dagger 2 for component management
+- **Database**: Room for local data persistence
+- **Networking**: App → ApiCallManager → wsnet library → API endpoints
+- **VPN Protocols**: OpenVPN, WireGuard, IKEv2/IPSec
+- **UI**: Mix of traditional Android Views and Jetpack Compose
+- **Background Processing**: WorkManager for scheduled tasks
+- **Languages**: Kotlin (preferred) and Java (legacy)
+
+### Build Variants
+- **google**: Google Play Store version with Firebase and billing
+- **fdroid**: F-Droid version without proprietary dependencies
+
+## Development Workflow
+
+### Code Style
+- Use ktlint with default rules for Kotlin code
+- Follow grandcentrix-AndroidCodeStyle for Java code
+- Prefer Kotlin over Java for new code
+- Use coroutines and Kotlin flows for async operations
+
+### Testing Strategy
+- Unit tests for business logic
+- Instrumented tests for Android components
+- Mock test data available in `test/` module
+- Test runner: `com.windscribe.vpn.CustomRunner`
+
+### Key Components to Understand
+1. **VPN Management**: Multi-protocol VPN controller in base module
+2. **Connection State**: Centralized connection state management
+3. **Server Selection**: Location and server selection logic
+4. **User Authentication**: Account management and authentication
+5. **Settings**: App preferences and configuration
+6. **Auto-Connection**: Background connection management
+
+## Common Development Tasks
+
+### Adding New VPN Features
+1. Modify base module for core functionality
+2. Update mobile/TV UIs as needed
+3. Add appropriate tests
+4. Update database schema if needed
+
+### UI Changes
+- Mobile: Update fragments and activities in mobile module
+- TV: Update leanback components in tv module
+- Use existing design patterns and components
+
+### Network/API Changes
+- Update Retrofit interfaces in base module
+- Add corresponding data models
+- Update database entities if needed
+
+### Adding Dependencies
+- Add to base module build.gradle for shared dependencies
+- Use appropriate product flavors for platform-specific dependencies
+- Update dependency check configuration if needed
+
+## Security Considerations
+- VPN credentials and certificates are stored securely
+- Network security config varies by build type
+- SSL pinning implemented for API calls
+- Proguard/R8 obfuscation enabled for release builds

tv/src/main/java/com/windscribe/tv/welcome/WelcomeActivity.kt

@@ -339,8 +339,8 @@ class WelcomeActivity :
         replaceFragment(fragment, true)
     }
 
-    override fun onAuthSignUpClick() {
-
+    override fun onAuthSignUpClick(username: String, password: String, email: String?) {
+        presenter.onAuthSignUpClick(username, password, email)
     }
 
     private fun permissionGranted(): Boolean {

tv/src/main/java/com/windscribe/tv/welcome/WelcomePresenter.kt

@@ -27,4 +27,5 @@ interface WelcomePresenter {
     )
 
     fun onAuthLoginClick(username: String, password: String)
+    fun onAuthSignUpClick(username: String, password: String, email: String?)
 }

tv/src/main/java/com/windscribe/tv/welcome/WelcomePresenterImpl.kt

@@ -234,6 +234,54 @@ class WelcomePresenterImpl @Inject constructor(
         }
     }
 
+    override fun onAuthSignUpClick(username: String, password: String, email: String?) {
+        isRegistration = true
+        welcomeView.hideSoftKeyboard()
+        if (validateLoginInputs(username, password, email ?: "", false)) {
+            logger.info("Requesting auth signup token.")
+            welcomeView.prepareUiForApiCallStart()
+            interactor.getCompositeDisposable().add(
+                interactor.getApiCallManager()
+                    .authTokenSignup(true)
+                    .doOnSubscribe { welcomeView.updateCurrentProcess("Preparing signup...") }
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribeWith(
+                        object :
+                            DisposableSingleObserver<GenericResponseClass<AuthToken?, ApiErrorResponse?>?>() {
+                            override fun onError(e: Throwable) {
+                                logger.error("Auth signup token: {}", e.message)
+                                onLoginFailed()
+                            }
+
+                            override fun onSuccess(
+                                response: GenericResponseClass<AuthToken?, ApiErrorResponse?>
+                            ) {
+                                response.dataClass?.let {
+                                    if (it.captcha != null) {
+                                        val captchaArt = it.captcha!!.asciiArt!!
+                                        logger.info("Signup captcha received: $captchaArt")
+                                        welcomeView.prepareUiForApiCallFinished()
+                                        welcomeView.captchaReceived(
+                                            username,
+                                            password,
+                                            it.token,
+                                            captchaArt
+                                        )
+                                    } else {
+                                        logger.info("Starting signup without captcha")
+                                        startSignUpProcess(username, password, email, true, it.token, null)
+                                    }
+                                } ?: response.errorClass?.let {
+                                    logger.error("Signup: {}", it)
+                                    onLoginResponseError(it, username, password)
+                                }
+                            }
+                        })
+            )
+        }
+    }
+
     override fun startLoginProcess(
         username: String,
         password: String,
@@ -312,8 +360,8 @@ class WelcomePresenterImpl @Inject constructor(
                         null,
                         email,
                         "",
-                        null,
-                        null,
+                        secureToken,
+                        captcha,
                         floatArrayOf(),
                         floatArrayOf()
                     )

tv/src/main/java/com/windscribe/tv/welcome/fragment/CaptchaFragment.kt

@@ -4,6 +4,10 @@
 package com.windscribe.tv.welcome.fragment
 
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
 import android.graphics.Typeface
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -47,15 +51,48 @@ class CaptchaFragment : Fragment(),  WelcomeActivityCallback {
         return null
     }
 
+    private fun createAsciiArtBitmap(text: String): Bitmap {
+        val paint = Paint().apply {
+            typeface = Typeface.MONOSPACE
+            textSize = 24f
+            color = Color.GREEN
+            isAntiAlias = false
+        }
+        
+        val lines = text.split("\n")
+        val maxWidth = lines.maxOfOrNull { paint.measureText(it) }?.toInt() ?: 0
+        val lineHeight = paint.fontMetrics.let { it.bottom - it.top }
+        val totalHeight = (lineHeight * lines.size).toInt()
+        
+        val bitmap = Bitmap.createBitmap(
+            maxWidth + 20, 
+            totalHeight + 20, 
+            Bitmap.Config.ARGB_8888
+        )
+        
+        val canvas = Canvas(bitmap)
+        canvas.drawColor(Color.BLACK)
+        
+        var y = -paint.fontMetrics.top + 10
+        for (line in lines) {
+            canvas.drawText(line, 10f, y, paint)
+            y += lineHeight
+        }
+        
+        return bitmap
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         username = arguments?.getString("username")
         password = arguments?.getString("password")
         val captchaArt = arguments?.getString("captchaArt")
         val captchaText = decodeBase64ToArt(captchaArt!!)
         val token = arguments?.getString("secureToken")
-        binding.asciiView.text = captchaText
-        binding.asciiView.typeface = Typeface.MONOSPACE
+        captchaText?.let { text ->
+            val bitmap = createAsciiArtBitmap(text)
+            binding.asciiView.setImageBitmap(bitmap)
+        }
         binding.back.setOnClickListener {
             fragmentCallBack?.onBackButtonPressed()
         }

tv/src/main/java/com/windscribe/tv/welcome/fragment/FragmentCallback.kt

@@ -17,7 +17,7 @@ interface FragmentCallback {
     fun onGenerateCodeClick()
     fun onLoginButtonClick(username: String, password: String, twoFa: String?, secureToken: String?, captcha: String?)
     fun onAuthLoginClick(username: String, password: String)
-    fun onAuthSignUpClick()
+    fun onAuthSignUpClick(username: String, password: String, email: String?)
     fun onLoginClick()
     fun onSignUpButtonClick(
         username: String,

tv/src/main/java/com/windscribe/tv/welcome/fragment/LoginFragment.kt

@@ -80,7 +80,7 @@ class LoginFragment : Fragment(), WelcomeActivityCallback {
             callBack?.onGenerateCodeClick()
         }
         binding.loginSignUp.setOnClickListener {
-            callBack?.onLoginButtonClick(binding.usernameEdit.text.toString(), binding.passwordEdit.text.toString(), null, null, null)
+            callBack?.onAuthLoginClick(binding.usernameEdit.text.toString(), binding.passwordEdit.text.toString())
         }
         binding.passwordContainer.setOnClickListener {
             binding.showPassword.visibility = View.VISIBLE

tv/src/main/java/com/windscribe/tv/welcome/fragment/SignUpFragment.kt

@@ -89,9 +89,9 @@ class SignUpFragment : Fragment(), WelcomeActivityCallback {
                     binding.passwordEdit.text.toString(), "", true
                 )
             } else {
-                fragmentCallBack?.onSignUpButtonClick(
+                fragmentCallBack?.onAuthSignUpClick(
                     binding.usernameEdit.text.toString(),
-                    binding.passwordEdit.text.toString(), "", true, null, null
+                    binding.passwordEdit.text.toString(), ""
                 )
             }
         }

tv/src/main/res/layout/fragment_captcha.xml

@@ -38,16 +38,12 @@
                 app:layout_constraintTop_toBottomOf="@id/error"
                 android:scrollbars="horizontal">
 
-                <TextView
+                <ImageView
                     android:id="@+id/asciiView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="24sp"
-                    android:typeface="monospace"
-                    android:lineSpacingExtra="8dp"
-                    android:textColor="#00FF00"
-                    android:textAlignment="viewStart"
-                    android:textIsSelectable="true" />
+                    android:scaleType="matrix"
+                    android:contentDescription="ASCII Captcha" />
             </HorizontalScrollView>
 
             <androidx.appcompat.widget.AppCompatEditText