Merge branch 'aw/polycentric-profiles' into 'master'

Fix QR code generation for large polycentric export bundles

See merge request videostreaming/grayjay!155

app/src/main/AndroidManifest.xml

@@ -245,5 +245,9 @@
             android:name=".activities.PolycentricModerationActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".activities.QRCodeFullscreenActivity"
+            android:screenOrientation="sensorPortrait"
+            android:theme="@style/Theme.FutoVideo.NoActionBar" />
     </application>
 </manifest>

app/src/main/java/com/futo/platformplayer/activities/PolycentricBackupActivity.kt

@@ -13,15 +13,18 @@ import android.view.View
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateApp.Companion.withContext
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.views.buttons.BigButton
+import com.futo.platformplayer.activities.QRCodeFullscreenActivity
 import com.futo.polycentric.core.ContentType
 import com.futo.polycentric.core.SignedEvent
 import com.futo.polycentric.core.StorageTypeCRDTItem
@@ -29,8 +32,10 @@ import com.futo.polycentric.core.StorageTypeCRDTSetItem
 import com.futo.polycentric.core.Store
 import com.futo.polycentric.core.toBase64Url
 import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
 import com.google.zxing.MultiFormatWriter
 import com.google.zxing.common.BitMatrix
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -41,11 +46,27 @@ import userpackage.Protocol.URLInfo
 class PolycentricBackupActivity : AppCompatActivity() {
     private lateinit var _buttonShare: BigButton;
     private lateinit var _buttonCopy: BigButton;
+    private lateinit var _buttonExportFile: BigButton;
     private lateinit var _imageQR: ImageView;
     private lateinit var _exportBundle: String;
     private lateinit var _textQR: TextView;
+    private lateinit var _textQRHint: TextView;
     private lateinit var _loader: View
 
+    private val _createDocumentLauncher = registerForActivityResult(ActivityResultContracts.CreateDocument("text/plain")) { uri ->
+        uri?.let { fileUri ->
+            try {
+                contentResolver.openOutputStream(fileUri)?.use { outputStream ->
+                    outputStream.write(_exportBundle.toByteArray())
+                }
+                UIDialogs.toast(this, getString(R.string.profile_saved_successfully))
+            } catch (e: Exception) {
+                Logger.e(TAG, "Failed to write to document", e)
+                UIDialogs.toast(this, "Failed to save profile: ${e.message}")
+            }
+        }
+    }
+
     override fun attachBaseContext(newBase: Context?) {
         super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
     }
@@ -57,8 +78,10 @@ class PolycentricBackupActivity : AppCompatActivity() {
 
         _buttonShare = findViewById(R.id.button_share)
         _buttonCopy = findViewById(R.id.button_copy)
+        _buttonExportFile = findViewById(R.id.button_export_file)
         _imageQR = findViewById(R.id.image_qr)
         _textQR = findViewById(R.id.text_qr)
+        _textQRHint = findViewById(R.id.text_qr_hint)
         _loader = findViewById(R.id.progress_loader)
         findViewById<ImageButton>(R.id.button_back).setOnClickListener {
             finish();
@@ -66,14 +89,23 @@ class PolycentricBackupActivity : AppCompatActivity() {
 
         _imageQR.visibility = View.INVISIBLE
         _textQR.visibility = View.INVISIBLE
+        _textQRHint.visibility = View.INVISIBLE
         _loader.visibility = View.VISIBLE
         _buttonShare.visibility = View.INVISIBLE
         _buttonCopy.visibility = View.INVISIBLE
+        _buttonExportFile.visibility = View.INVISIBLE
 
         lifecycleScope.launch {
+            val bundle = withContext(Dispatchers.IO) { createExportBundle() }
+            _exportBundle = bundle
+            Logger.i(TAG, "Export bundle created, length: ${bundle.length}")
+            
             try {
                 val pair = withContext(Dispatchers.IO) {
-                    val bundle = createExportBundle()
+                    if (!isContentSuitableForQRCode(bundle)) {
+                        throw Exception("Data too big for QR code generation")
+                    }
+                    
                     val dimension = TypedValue.applyDimension(
                         TypedValue.COMPLEX_UNIT_DIP, 200f, resources.displayMetrics
                     ).toInt()
@@ -81,18 +113,35 @@ class PolycentricBackupActivity : AppCompatActivity() {
                     Pair(bundle, qr)
                 }
 
-                _exportBundle = pair.first
                 _imageQR.setImageBitmap(pair.second)
                 _imageQR.visibility = View.VISIBLE
                 _textQR.visibility = View.VISIBLE
+                _textQRHint.visibility = View.VISIBLE
                 _buttonShare.visibility = View.VISIBLE
                 _buttonCopy.visibility = View.VISIBLE
+                
+                _imageQR.setOnClickListener {
+                    val intent = QRCodeFullscreenActivity.createIntent(this@PolycentricBackupActivity, _exportBundle)
+                    startActivity(intent)
+                }
             } catch (e: Exception) {
-                Logger.e(TAG, getString(R.string.failed_to_generate_qr_code), e)
+                val byteSize = bundle.toByteArray(Charsets.UTF_8).size
+                Logger.e(TAG, "QR code generation failed. Bundle length: ${bundle.length} chars, ${byteSize} bytes, Error: ${e.message}", e)
+                
+                if (e.message?.contains("Data too big") == true) {
+                    _textQR.text = getString(R.string.qr_code_too_large_use_file_export)
+                    _buttonExportFile.visibility = View.VISIBLE
+                } else {
+                    _textQR.text = getString(R.string.failed_to_generate_qr_code)
+                }
+                
+                _textQR.visibility = View.VISIBLE
+                _textQRHint.visibility = View.INVISIBLE
+                _buttonShare.visibility = View.VISIBLE
+                _buttonCopy.visibility = View.VISIBLE
+                
+                // Hide QR image since generation failed
                 _imageQR.visibility = View.INVISIBLE
-                _textQR.visibility = View.INVISIBLE
-                _buttonShare.visibility = View.INVISIBLE
-                _buttonCopy.visibility = View.INVISIBLE
             } finally {
                 _loader.visibility = View.GONE
             }
@@ -108,11 +157,29 @@ class PolycentricBackupActivity : AppCompatActivity() {
             val clip = ClipData.newPlainText(getString(R.string.copied_text), _exportBundle);
             clipboard.setPrimaryClip(clip);
         };
+
+        _buttonExportFile.onClick.subscribe {
+            val fileName = "polycentric_profile_${System.currentTimeMillis()}.txt"
+            _createDocumentLauncher.launch(fileName)
+        };
+    }
+
+    private fun isContentSuitableForQRCode(content: String): Boolean {
+        val bytes = content.toByteArray(Charsets.UTF_8)
+        return bytes.size <= 2300  // QR Code Version 40 with Error Correction Level M can hold ~2331 bytes
     }
 
     private fun generateQRCode(content: String, width: Int, height: Int): Bitmap {
-        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height);
+        if (!isContentSuitableForQRCode(content)) {
-        return bitMatrixToBitmap(bitMatrix);
+            throw Exception("Data too big for QR code generation")
+        }
+        
+        val hints = java.util.EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
+        hints[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.M
+        hints[EncodeHintType.MARGIN] = 1
+        
+        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints)
+        return bitMatrixToBitmap(bitMatrix)
     }
 
     private fun bitMatrixToBitmap(matrix: BitMatrix): Bitmap {
@@ -203,7 +270,8 @@ class PolycentricBackupActivity : AppCompatActivity() {
             .setBody(exportBundle.toByteString())
             .build();
 
-        return "polycentric://" + urlInfo.toByteArray().toBase64Url()
+        val data = urlInfo.toByteArray()
+        return "polycentric://" + data.toBase64Url()
     }
 
     companion object {

app/src/main/java/com/futo/platformplayer/activities/PolycentricImportProfileActivity.kt

@@ -32,100 +32,166 @@ import userpackage.Protocol
 import userpackage.Protocol.ExportBundle
 
 class PolycentricImportProfileActivity : AppCompatActivity() {
-    private lateinit var _buttonHelp: ImageButton;
+    private lateinit var _buttonHelp: ImageButton
-    private lateinit var _buttonScanProfile: LinearLayout;
+    private lateinit var _buttonScanProfile: LinearLayout
-    private lateinit var _buttonImportProfile: LinearLayout;
+    private lateinit var _buttonImportFile: LinearLayout
-    private lateinit var _editProfile: EditText;
+    private lateinit var _buttonImportProfile: LinearLayout
-    private lateinit var _loaderOverlay: LoaderOverlay;
+    private lateinit var _editProfile: EditText
+    private lateinit var _loaderOverlay: LoaderOverlay
 
-    private val _qrCodeResultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+    private val _qrCodeResultLauncher =
-        val scanResult = IntentIntegrator.parseActivityResult(result.resultCode, result.data)
+            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        scanResult?.let {
+                val scanResult =
-            if (it.contents != null) {
+                        IntentIntegrator.parseActivityResult(result.resultCode, result.data)
-                val scannedUrl = it.contents
+                scanResult?.let {
-                import(scannedUrl)
+                    if (it.contents != null) {
+                        val scannedUrl = it.contents
+                        import(scannedUrl)
+                    }
+                }
+            }
+
+    private val _filePickerLauncher =
+            registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
+                uri?.let { fileUri ->
+                    try {
+                        // Check file size before reading
+                        val fileSize =
+                                contentResolver.openFileDescriptor(fileUri, "r")?.statSize ?: 0
+                        val maxFileSize = 10 * 1024 * 1024 // 10MB limit
+
+                        if (fileSize > maxFileSize) {
+                            UIDialogs.toast(this, "File too large. Maximum size is 10MB.")
+                            return@let
+                        }
+
+                        if (fileSize == 0L) {
+                            UIDialogs.toast(this, "Selected file is empty.")
+                            return@let
+                        }
+
+                        val content =
+                                contentResolver
+                                        .openInputStream(fileUri)
+                                        ?.bufferedReader()
+                                        ?.readText()
+                        content?.let { fileContent ->
+                            val trimmedContent = fileContent.trim()
+
+                            // Check if content is empty after trimming
+                            if (trimmedContent.isEmpty()) {
+                                UIDialogs.toast(this, "Selected file contains no data.")
+                                return@let
+                            }
+
+                            // Check if content looks like a valid polycentric URL
+                            if (!trimmedContent.startsWith("polycentric://")) {
+                                UIDialogs.toast(
+                                        this,
+                                        "Selected file does not contain a valid polycentric profile URL."
+                                )
+                                return@let
+                            }
+
+                            import(trimmedContent)
+                        }
+                                ?: run { UIDialogs.toast(this, "Could not read file content.") }
+                    } catch (e: SecurityException) {
+                        Logger.e(TAG, "Security exception reading file", e)
+                        UIDialogs.toast(this, "Permission denied to read file.")
+                    } catch (e: OutOfMemoryError) {
+                        Logger.e(TAG, "Out of memory reading file", e)
+                        UIDialogs.toast(this, "File too large to process.")
+                    } catch (e: Exception) {
+                        Logger.e(TAG, "Failed to read file", e)
+                        UIDialogs.toast(this, "Failed to read file: ${e.message}")
+                    }
+                }
             }
-        }
-    }
 
     override fun attachBaseContext(newBase: Context?) {
         super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState);
+        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_polycentric_import_profile);
+        setContentView(R.layout.activity_polycentric_import_profile)
-        setNavigationBarColorAndIcons();
+        setNavigationBarColorAndIcons()
 
-        _buttonHelp = findViewById(R.id.button_help);
+        _buttonHelp = findViewById(R.id.button_help)
-        _buttonScanProfile = findViewById(R.id.button_scan_profile);
+        _buttonScanProfile = findViewById(R.id.button_scan_profile)
-        _buttonImportProfile = findViewById(R.id.button_import_profile);
+        _buttonImportFile = findViewById(R.id.button_import_file)
-        _loaderOverlay = findViewById(R.id.loader_overlay);
+        _buttonImportProfile = findViewById(R.id.button_import_profile)
-        _editProfile = findViewById(R.id.edit_profile);
+        _loaderOverlay = findViewById(R.id.loader_overlay)
-        findViewById<ImageButton>(R.id.button_back).setOnClickListener {
+        _editProfile = findViewById(R.id.edit_profile)
-            finish();
+        findViewById<ImageButton>(R.id.button_back).setOnClickListener { finish() }
-        };
 
         _buttonHelp.setOnClickListener {
-            startActivity(Intent(this, PolycentricWhyActivity::class.java));
+            startActivity(Intent(this, PolycentricWhyActivity::class.java))
-        };
+        }
 
         _buttonScanProfile.setOnClickListener {
             val integrator = IntentIntegrator(this)
             integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE)
             integrator.setPrompt(getString(R.string.scan_a_qr_code))
-            integrator.setOrientationLocked(true);
+            integrator.setOrientationLocked(true)
             integrator.setCameraId(0)
             integrator.setBeepEnabled(false)
             integrator.setBarcodeImageEnabled(true)
-            integrator.setCaptureActivity(QRCaptureActivity::class.java);
+            integrator.setCaptureActivity(QRCaptureActivity::class.java)
             _qrCodeResultLauncher.launch(integrator.createScanIntent())
-        };
+        }
+
+        _buttonImportFile.setOnClickListener { _filePickerLauncher.launch("text/plain") }
 
         _buttonImportProfile.setOnClickListener {
             if (_editProfile.text.isEmpty()) {
-                UIDialogs.toast(this, getString(R.string.text_field_does_not_contain_any_data));
+                UIDialogs.toast(this, getString(R.string.text_field_does_not_contain_any_data))
-                return@setOnClickListener;
+                return@setOnClickListener
             }
 
-            import(_editProfile.text.toString());
+            import(_editProfile.text.toString())
-        };
+        }
 
-        val url = intent.getStringExtra("url");
+        val url = intent.getStringExtra("url")
         if (url != null) {
-            import(url);
+            import(url)
         }
     }
 
     private fun import(url: String) {
         if (!url.startsWith("polycentric://")) {
-            UIDialogs.toast(this, getString(R.string.not_a_valid_url));
+            UIDialogs.toast(this, getString(R.string.not_a_valid_url))
-            return;
+            return
         }
 
         _loaderOverlay.show()
 
         lifecycleScope.launch(Dispatchers.IO) {
             try {
-                val data = url.substring("polycentric://".length).base64UrlToByteArray();
+                val data = url.substring("polycentric://".length).base64UrlToByteArray()
-                val urlInfo = Protocol.URLInfo.parseFrom(data);
+                val urlInfo = Protocol.URLInfo.parseFrom(data)
+
                 if (urlInfo.urlType != 3L) {
                     throw Exception("Expected urlInfo struct of type ExportBundle")
                 }
 
-                val exportBundle = ExportBundle.parseFrom(urlInfo.body);
+                val exportBundle = ExportBundle.parseFrom(urlInfo.body)
-                val keyPair = KeyPair.fromProto(exportBundle.keyPair);
+                val keyPair = KeyPair.fromProto(exportBundle.keyPair)
 
-                val existingProcessSecret = Store.instance.getProcessSecret(keyPair.publicKey);
+                val existingProcessSecret = Store.instance.getProcessSecret(keyPair.publicKey)
                 if (existingProcessSecret != null) {
                     withContext(Dispatchers.Main) {
-                        UIDialogs.toast(this@PolycentricImportProfileActivity, getString(R.string.this_profile_is_already_imported));
+                        UIDialogs.toast(
+                                this@PolycentricImportProfileActivity,
+                                getString(R.string.this_profile_is_already_imported)
+                        )
                     }
-                    return@launch;
+                    return@launch
                 }
 
-                val processSecret = ProcessSecret(keyPair, Process.random());
+                val processSecret = ProcessSecret(keyPair, Process.random())
-                Store.instance.addProcessSecret(processSecret);
+                Store.instance.addProcessSecret(processSecret)
 
                 try {
                     PolycentricStorage.instance.addProcessSecret(processSecret)
@@ -133,37 +199,43 @@ class PolycentricImportProfileActivity : AppCompatActivity() {
                     Logger.e(TAG, "Failed to save process secret to secret storage.", e)
                 }
 
-                val processHandle = processSecret.toProcessHandle();
+                val processHandle = processSecret.toProcessHandle()
 
                 for (e in exportBundle.events.eventsList) {
                     try {
-                        val se = SignedEvent.fromProto(e);
+                        val se = SignedEvent.fromProto(e)
-                        Store.instance.putSignedEvent(se);
+                        Store.instance.putSignedEvent(se)
                     } catch (e: Throwable) {
-                        Logger.w(TAG, "Ignored invalid event", e);
+                        Logger.w(TAG, "Ignored invalid event", e)
                     }
                 }
 
-                StatePolycentric.instance.setProcessHandle(processHandle);
+                StatePolycentric.instance.setProcessHandle(processHandle)
-                processHandle.fullyBackfillClient(ApiMethods.SERVER);
+                processHandle.fullyBackfillClient(ApiMethods.SERVER)
                 withContext(Dispatchers.Main) {
-                    startActivity(Intent(this@PolycentricImportProfileActivity, PolycentricProfileActivity::class.java));
+                    startActivity(
-                    finish();
+                            Intent(
+                                    this@PolycentricImportProfileActivity,
+                                    PolycentricProfileActivity::class.java
+                            )
+                    )
+                    finish()
                 }
             } catch (e: Throwable) {
-                Logger.w(TAG, "Failed to import profile", e);
+                Logger.w(TAG, "Failed to import profile", e)
                 withContext(Dispatchers.Main) {
-                    UIDialogs.toast(this@PolycentricImportProfileActivity, getString(R.string.failed_to_import_profile) + " '${e.message}'");
+                    UIDialogs.toast(
+                            this@PolycentricImportProfileActivity,
+                            getString(R.string.failed_to_import_profile) + " '${e.message}'"
+                    )
                 }
             } finally {
-                withContext(Dispatchers.Main) {
+                withContext(Dispatchers.Main) { _loaderOverlay.hide() }
-                    _loaderOverlay.hide();
-                }
             }
         }
     }
 
     companion object {
-        private const val TAG = "PolycentricImportProfileActivity";
+        private const val TAG = "PolycentricImportProfileActivity"
     }
-}
+}

app/src/main/java/com/futo/platformplayer/activities/QRCodeFullscreenActivity.kt

@@ -0,0 +1,109 @@
+package com.futo.platformplayer.activities
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.os.Bundle
+import android.util.TypedValue
+import android.view.View
+import android.widget.ImageButton
+import android.widget.ImageView
+import androidx.appcompat.app.AppCompatActivity
+import com.futo.platformplayer.R
+import com.futo.platformplayer.setNavigationBarColorAndIcons
+import com.futo.platformplayer.states.StateApp
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.EncodeHintType
+import com.google.zxing.MultiFormatWriter
+import com.google.zxing.common.BitMatrix
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
+
+class QRCodeFullscreenActivity : AppCompatActivity() {
+    companion object {
+        private const val EXTRA_QR_TEXT = "qr_text"
+        
+        fun createIntent(context: Context, qrText: String): android.content.Intent {
+            return android.content.Intent(context, QRCodeFullscreenActivity::class.java).apply {
+                putExtra(EXTRA_QR_TEXT, qrText)
+            }
+        }
+    }
+
+    override fun attachBaseContext(newBase: Context?) {
+        super.attachBaseContext(StateApp.instance.getLocaleContext(newBase))
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_qr_code_fullscreen)
+        setNavigationBarColorAndIcons()
+
+        val qrText = intent.getStringExtra(EXTRA_QR_TEXT)
+
+        val imageQR = findViewById<ImageView>(R.id.image_qr_fullscreen)
+        val buttonBack = findViewById<ImageButton>(R.id.button_back_fullscreen)
+        val buttonClose = findViewById<ImageButton>(R.id.button_close_fullscreen)
+
+        // Generate QR code bitmap from text
+        qrText?.let { text ->
+            try {
+                if (!isContentSuitableForQRCode(text)) {
+                    throw Exception("Data too big for QR code generation")
+                }
+                
+                val dimension = TypedValue.applyDimension(
+                    TypedValue.COMPLEX_UNIT_DIP, 300f, resources.displayMetrics
+                ).toInt()
+                val qrBitmap = generateQRCode(text, dimension, dimension)
+                imageQR.setImageBitmap(qrBitmap)
+            } catch (e: Exception) {
+                // If QR generation fails, show error or fallback
+                imageQR.setImageResource(R.drawable.ic_qr)
+            }
+        }
+
+        buttonBack.setOnClickListener {
+            finish()
+        }
+
+        buttonClose.setOnClickListener {
+            finish()
+        }
+
+        imageQR.setOnClickListener {
+            finish()
+        }
+    }
+
+    private fun isContentSuitableForQRCode(content: String): Boolean {
+        val bytes = content.toByteArray(Charsets.UTF_8)
+        return bytes.size <= 2300  // QR Code Version 40 with Error Correction Level M can hold ~2331 bytes
+    }
+
+    private fun generateQRCode(content: String, width: Int, height: Int): Bitmap {
+        if (!isContentSuitableForQRCode(content)) {
+            throw Exception("Data too big for QR code generation")
+        }
+        
+        val hints = java.util.EnumMap<EncodeHintType, Any>(EncodeHintType::class.java)
+        hints[EncodeHintType.ERROR_CORRECTION] = ErrorCorrectionLevel.M
+        hints[EncodeHintType.MARGIN] = 1
+        
+        val bitMatrix = MultiFormatWriter().encode(content, BarcodeFormat.QR_CODE, width, height, hints)
+        return bitMatrixToBitmap(bitMatrix)
+    }
+
+    private fun bitMatrixToBitmap(matrix: BitMatrix): Bitmap {
+        val width = matrix.width
+        val height = matrix.height
+        val bmp = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565)
+
+        for (x in 0 until width) {
+            for (y in 0 until height) {
+                bmp.setPixel(x, y, if (matrix[x, y]) Color.BLACK else Color.WHITE)
+            }
+        }
+        return bmp
+    }
+}
+

app/src/main/res/layout/activity_polycentric_backup.xml

@@ -29,6 +29,8 @@
         android:id="@+id/image_qr"
         android:layout_width="200dp"
         android:layout_height="200dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:padding="8dp"
         app:srcCompat="@drawable/ic_qr"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -37,15 +39,31 @@
 
     <TextView
         android:id="@+id/text_qr"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/scan_to_import"
         android:fontFamily="@font/inter_light"
         android:textSize="32dp"
+        android:textAlignment="center"
         android:layout_marginTop="12dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
         app:layout_constraintTop_toBottomOf="@id/image_qr"
-        app:layout_constraintLeft_toLeftOf="@id/image_qr"
+        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="@id/image_qr" />
+        app:layout_constraintRight_toRightOf="parent" />
+
+    <TextView
+        android:id="@+id/text_qr_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/tap_qr_code_for_fullscreen"
+        android:fontFamily="@font/inter_light"
+        android:textSize="14dp"
+        android:textColor="@color/gray_400"
+        android:layout_marginTop="8dp"
+        app:layout_constraintTop_toBottomOf="@id/text_qr"
+        app:layout_constraintLeft_toLeftOf="@id/text_qr"
+        app:layout_constraintRight_toRightOf="@id/text_qr" />
 
     <LinearLayout
         android:id="@+id/layout_buttons"
@@ -55,7 +73,7 @@
         android:layout_marginStart="20dp"
         android:layout_marginEnd="20dp"
         android:layout_marginTop="30dp"
-        app:layout_constraintTop_toBottomOf="@id/text_qr"
+        app:layout_constraintTop_toBottomOf="@id/text_qr_hint"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent">
 
@@ -75,6 +93,15 @@
             app:buttonSubText="@string/copy_your_identity_to_clipboard"
             app:buttonIcon="@drawable/ic_copy"
             android:layout_marginTop="8dp" />
+
+        <com.futo.platformplayer.views.buttons.BigButton
+            android:id="@+id/button_export_file"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:buttonText="@string/export_to_file"
+            app:buttonSubText="@string/save_profile_to_file_for_sharing"
+            app:buttonIcon="@drawable/ic_download"
+            android:layout_marginTop="8dp" />
     </LinearLayout>
 
     <ProgressBar

app/src/main/res/layout/activity_polycentric_import_profile.xml

@@ -47,6 +47,28 @@
             android:text="@string/scan_qr" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/button_import_file"
+        android:layout_width="140dp"
+        android:layout_height="40dp"
+        android:background="@drawable/background_button_primary_round"
+        android:gravity="center"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:orientation="horizontal"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/button_scan_profile">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/inter_light"
+            android:textColor="@color/white"
+            android:textSize="16dp"
+            android:text="@string/import_from_file" />
+    </LinearLayout>
+
     <TextView
         android:id="@+id/text_or"
         android:layout_width="wrap_content"
@@ -55,7 +77,7 @@
         android:fontFamily="@font/inter_light"
         android:textSize="28dp"
         android:layout_marginTop="30dp"
-        app:layout_constraintTop_toBottomOf="@id/button_scan_profile"
+        app:layout_constraintTop_toBottomOf="@id/button_import_file"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
 

app/src/main/res/layout/activity_qr_code_fullscreen.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black">
+
+    <!-- Top navigation bar -->
+    <ImageButton
+        android:id="@+id/button_back_fullscreen"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:contentDescription="@string/cd_button_back"
+        android:padding="10dp"
+        android:scaleType="fitCenter"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        app:srcCompat="@drawable/ic_back_thin_white_16dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginTop="16dp"
+        android:layout_marginStart="16dp" />
+
+    <ImageButton
+        android:id="@+id/button_close_fullscreen"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:contentDescription="@string/cd_button_close"
+        android:padding="10dp"
+        android:scaleType="fitCenter"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        app:srcCompat="@drawable/ic_close"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp" />
+
+    <!-- Full screen QR code -->
+    <ImageView
+        android:id="@+id/image_qr_fullscreen"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scaleType="fitCenter"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:padding="40dp"
+        app:layout_constraintTop_toBottomOf="@id/button_back_fullscreen"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+

app/src/main/res/values-ar/strings.xml

@@ -388,6 +388,7 @@
     <string name="unhandled_exception_in_vs">استثناء غير معالج في VS</string>
     <string name="send_exception_to_developers">إرسال الاستثناء للمطورين…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">تم تعيين مفتاح الترخيص الخاص بك!\nقد يكون هناك حاجة لإعادة تشغيل التطبيق.</string>
+    <string name="qr_code_too_large_use_text_below">رمز الاستجابة السريعة كبير جدًا. استخدم النص أدناه لمشاركة ملفك الشخصي.</string>
     <string name="invalid_license_format">تنسيق الترخيص غير صالح</string>
     <string name="unknown_content_format">تنسيق المحتوى غير معروف</string>
     <string name="unknown_file_format">تنسيق الملف غير معروف</string>

app/src/main/res/values-de/strings.xml

@@ -395,6 +395,7 @@
     <string name="unhandled_exception_in_vs">Unbehandelte Ausnahme in VS</string>
     <string name="send_exception_to_developers">Ausnahme an Entwickler senden…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">Ihr Lizenzschlüssel wurde festgelegt!\nEin Neustart der App könnte erforderlich sein.</string>
+    <string name="qr_code_too_large_use_text_below">QR-Code zu groß. Verwenden Sie den Text unten, um Ihr Profil zu teilen.</string>
     <string name="invalid_license_format">Ungültiges Lizenzformat</string>
     <string name="unknown_content_format">Unbekanntes Inhaltsformat</string>
     <string name="unknown_file_format">Unbekanntes Dateiformat</string>

app/src/main/res/values-es/strings.xml

@@ -372,6 +372,7 @@
     <string name="unhandled_exception_in_vs">Excepción no manejada en VS</string>
     <string name="send_exception_to_developers">Enviar excepción a los desarrolladores...</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">¡Se ha configurado tu clave de licencia!\nPuede ser necesario reiniciar la aplicación.</string>
+    <string name="qr_code_too_large_use_text_below">Código QR demasiado grande. Use el texto de abajo para compartir su perfil.</string>
     <string name="invalid_license_format">Formato de licencia no válido</string>
     <string name="unknown_content_format">Formato de contenido desconocido</string>
     <string name="unknown_file_format">Formato de archivo desconocido</string>

app/src/main/res/values-fr/strings.xml

@@ -411,6 +411,7 @@
     <string name="unhandled_exception_in_vs">Exception non gérée dans VS</string>
     <string name="send_exception_to_developers">Envoyer l\'exception aux développeurs…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">Votre clé de licence a été définie !\nUn redémarrage de l\'application peut être nécessaire.</string>
+    <string name="qr_code_too_large_use_text_below">Code QR trop volumineux. Utilisez le texte ci-dessous pour partager votre profil.</string>
     <string name="invalid_license_format">Format de licence invalide</string>
     <string name="unknown_content_format">Format de contenu inconnu</string>
     <string name="unknown_file_format">Format de fichier inconnu</string>

app/src/main/res/values-it/strings.xml

@@ -617,6 +617,7 @@
     <string name="unhandled_exception_in_vs">Eccezione non gestita in VS</string>
     <string name="send_exception_to_developers">Invio eccezione agli sviluppatori…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">La tua chiave di licenza è stata impostata!\nIl riavvio dell\'app potrebbe essere richiesto.</string>
+    <string name="qr_code_too_large_use_text_below">Codice QR troppo grande. Usa il testo qui sotto per condividere il tuo profilo.</string>
     <string name="invalid_license_format">Formato licenza non valido</string>
     <string name="unknown_content_format">Formato contenuto sconosciuto</string>
     <string name="unknown_file_format">Formato file sconosciuto</string>

app/src/main/res/values-ja/strings.xml

@@ -374,6 +374,7 @@
     <string name="unhandled_exception_in_vs">VSで未処理の例外</string>
     <string name="send_exception_to_developers">開発者に例外を送信…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">ライセンスキーが設定されました！\nアプリを再起動する可能性があります。</string>
+    <string name="qr_code_too_large_use_text_below">QRコードが大きすぎます。下のテキストを使用してプロフィールを共有してください。</string>
     <string name="invalid_license_format">無効なライセンス形式</string>
     <string name="unknown_content_format">不明なコンテンツ形式</string>
     <string name="unknown_file_format">不明なファイル形式</string>

app/src/main/res/values-ko/strings.xml

@@ -410,6 +410,7 @@
     <string name="unhandled_exception_in_vs">VS에서 처리되지 않은 예외</string>
     <string name="send_exception_to_developers">개발자에게 예외를 보냅니다…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">라이선스 키가 설정되었습니다!\n앱을 다시 시작해야 할 수 있습니다.</string>
+    <string name="qr_code_too_large_use_text_below">QR 코드가 너무 큽니다. 아래 텍스트를 사용하여 프로필을 공유하세요.</string>
     <string name="invalid_license_format">잘못된 라이선스 형식</string>
     <string name="unknown_content_format">알 수 없는 콘텐츠 형식</string>
     <string name="unknown_file_format">알 수 없는 파일 형식</string>

app/src/main/res/values-pt/strings.xml

@@ -407,6 +407,7 @@
     <string name="unhandled_exception_in_vs">Exceção não tratada no VS</string>
     <string name="send_exception_to_developers">Enviar exceção aos desenvolvedores…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">Sua chave de licença foi definida!\nUma reinicialização do aplicativo pode ser necessária.</string>
+    <string name="qr_code_too_large_use_text_below">Código QR muito grande. Use o texto abaixo para compartilhar seu perfil.</string>
     <string name="invalid_license_format">Formato de licença inválido</string>
     <string name="unknown_content_format">Formato de conteúdo desconhecido</string>
     <string name="unknown_file_format">Formato de arquivo desconhecido</string>

app/src/main/res/values-ru/strings.xml

@@ -407,6 +407,7 @@
     <string name="unhandled_exception_in_vs">Необработанное исключение в VS</string>
     <string name="send_exception_to_developers">Отправить исключение разработчикам…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">Ваш лицензионный ключ установлен!\nМожет потребоваться перезагрузка приложения.</string>
+    <string name="qr_code_too_large_use_text_below">QR-код слишком большой. Используйте текст ниже, чтобы поделиться своим профилем.</string>
     <string name="invalid_license_format">Неверный формат лицензии</string>
     <string name="unknown_content_format">Неизвестный формат содержимого</string>
     <string name="unknown_file_format">Неизвестный формат файла</string>

app/src/main/res/values-tr/strings.xml

@@ -581,6 +581,7 @@
     <string name="unhandled_exception_in_vs">VS\'de bilinmeyen hata (exception)</string>
     <string name="send_exception_to_developers">Geliştiricilere exception\'ı gönder…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">Lisans anahtarınız ayarlandı!\nUygulamayı yeniden başlatmanız gerekebilir.</string>
+    <string name="qr_code_too_large_use_text_below">QR kodu çok büyük. Profilinizi paylaşmak için aşağıdaki metni kullanın.</string>
     <string name="invalid_license_format">Geçersiz lisans formatı</string>
     <string name="unknown_content_format">Bilinmeyen içerik formatı</string>
     <string name="unknown_file_format">Bilinmeyen dosya formatı</string>

app/src/main/res/values-zh/strings.xml

@@ -411,6 +411,7 @@
     <string name="unhandled_exception_in_vs">VS 中的未处理异常</string>
     <string name="send_exception_to_developers">向开发者发送异常…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">您的许可证密钥已设置！\n可能需要重新启动应用程序。</string>
+    <string name="qr_code_too_large_use_text_below">二维码太大。请使用下方文字分享您的个人资料。</string>
     <string name="invalid_license_format">无效的许可证格式</string>
     <string name="unknown_content_format">未知的内容格式</string>
     <string name="unknown_file_format">未知的文件格式</string>

app/src/main/res/values/strings.xml

@@ -646,6 +646,7 @@
     <string name="unhandled_exception_in_vs">Unhandled exception in VS</string>
     <string name="send_exception_to_developers">Send exception to developers…</string>
     <string name="your_license_key_has_been_set_an_app_restart_might_be_required">Your license key has been set!\nAn app restart might be required.</string>
+    <string name="qr_code_too_large_use_text_below">QR code too large. Use the text below to share your profile.</string>
     <string name="invalid_license_format">Invalid license format</string>
     <string name="unknown_content_format">Unknown content format</string>
     <string name="unknown_file_format">Unknown file format</string>
@@ -1175,4 +1176,10 @@
         <item>1500</item>
         <item>2000</item>
     </string-array>
+    <string name="qr_code_too_large_use_file_export">Export to file or copy backup code</string>
+    <string name="tap_qr_code_for_fullscreen">Tap QR code for fullscreen view</string>
+    <string name="export_to_file">Export to File</string>
+    <string name="import_from_file">Import from File</string>
+    <string name="save_profile_to_file_for_sharing">Save profile to file for sharing</string>
+    <string name="profile_saved_successfully">Profile saved successfully</string>
 </resources>