From f6931bcf8c81d5e11443c8493afdd8b5f23dce04 Mon Sep 17 00:00:00 2001 From: Koen Date: Tue, 16 Jan 2024 20:07:26 +0100 Subject: [PATCH 1/2] Added isUserGesturing boolean to gesture control view. --- .../PolycentricCreateProfileActivity.kt | 18 ++++++++++++++++-- .../views/behavior/GestureControlView.kt | 2 ++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt index 32b4f42a..b6ff638f 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt @@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import com.futo.platformplayer.R import com.futo.platformplayer.UIDialogs +import com.futo.platformplayer.encryption.GEncryptionProvider import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.setNavigationBarColorAndIcons @@ -17,11 +18,10 @@ import com.futo.platformplayer.states.StateApp import com.futo.platformplayer.states.StatePolycentric import com.futo.polycentric.core.ProcessHandle import com.futo.polycentric.core.Store -import com.futo.polycentric.core.Synchronization import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import java.util.UUID class PolycentricCreateProfileActivity : AppCompatActivity() { private lateinit var _buttonHelp: ImageButton; @@ -71,6 +71,20 @@ class PolycentricCreateProfileActivity : AppCompatActivity() { try { processHandle = ProcessHandle.create(); Store.instance.addProcessSecret(processHandle.processSecret); + + try { + val encryptedSecret = GEncryptionProvider.instance.encrypt(processHandle.processSecret.toProto().toByteArray()) + val fileName = "polycentricProcessSecrets/${UUID.randomUUID()}" + + val fileOutput = openFileOutput(fileName, Context.MODE_PRIVATE) + fileOutput.write(encryptedSecret) + fileOutput.close() + + Logger.i(TAG, "Process secret saved to file: $fileName") + } catch (e: Exception) { + Logger.e(TAG, "Error saving process secret to file", e) + } + processHandle.addServer("https://srv1-stg.polycentric.io"); processHandle.setUsername(username); StatePolycentric.instance.setProcessHandle(processHandle); diff --git a/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt b/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt index 7f7d2429..4b39b1cd 100644 --- a/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt +++ b/app/src/main/java/com/futo/platformplayer/views/behavior/GestureControlView.kt @@ -93,6 +93,8 @@ class GestureControlView : LinearLayout { private val _gestureController: GestureDetectorCompat; + val isUserGesturing get() = _rewinding || _skipping || _adjustingBrightness || _adjustingSound || _adjustingFullscreenUp || _adjustingFullscreenDown || _isPanning || _isZooming; + val onSeek = Event1(); val onBrightnessAdjusted = Event1(); val onPan = Event2(); From a0af8805e791d2252f7fd6cccb7a97363bcca8e3 Mon Sep 17 00:00:00 2001 From: Koen Date: Tue, 16 Jan 2024 20:09:02 +0100 Subject: [PATCH 2/2] Removed accidentally cmomitted code. --- .../PolycentricCreateProfileActivity.kt | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt index b6ff638f..4986a186 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/PolycentricCreateProfileActivity.kt @@ -10,7 +10,6 @@ import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import com.futo.platformplayer.R import com.futo.platformplayer.UIDialogs -import com.futo.platformplayer.encryption.GEncryptionProvider import com.futo.platformplayer.fullyBackfillServersAnnounceExceptions import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.setNavigationBarColorAndIcons @@ -21,7 +20,6 @@ import com.futo.polycentric.core.Store import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import java.util.UUID class PolycentricCreateProfileActivity : AppCompatActivity() { private lateinit var _buttonHelp: ImageButton; @@ -72,19 +70,6 @@ class PolycentricCreateProfileActivity : AppCompatActivity() { processHandle = ProcessHandle.create(); Store.instance.addProcessSecret(processHandle.processSecret); - try { - val encryptedSecret = GEncryptionProvider.instance.encrypt(processHandle.processSecret.toProto().toByteArray()) - val fileName = "polycentricProcessSecrets/${UUID.randomUUID()}" - - val fileOutput = openFileOutput(fileName, Context.MODE_PRIVATE) - fileOutput.write(encryptedSecret) - fileOutput.close() - - Logger.i(TAG, "Process secret saved to file: $fileName") - } catch (e: Exception) { - Logger.e(TAG, "Error saving process secret to file", e) - } - processHandle.addServer("https://srv1-stg.polycentric.io"); processHandle.setUsername(username); StatePolycentric.instance.setProcessHandle(processHandle);