Merge pull request #470 from mysteriumnetwork/bugfix/Fix-deffered-nod…

…e-set-up Fix deffered node set up
mysteriumnetwork · Nov 19, 2021 · 2397054 · 2397054
2 parents f53ebf1 + 4003343
commit 2397054
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/splash/SplashActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/splash/SplashActivity.kt
@@ -101,8 +101,10 @@ class SplashActivity : BaseActivity() {
         })
 
         lifecycleScope.launchWhenStarted {
-            analytic.eventTracked.collect {
-                navigateForward()
+            analytic.eventTracked.collect { event ->
+                if (event == AnalyticEvent.STARTUP.eventName) {
+                    navigateForward()
+                }
             }
         }
     }

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/splash/SplashViewModel.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/splash/SplashViewModel.kt
@@ -65,8 +65,6 @@ class SplashViewModel(useCaseProvider: UseCaseProvider) : ViewModel() {
                 }
             } else {
                 service?.let {
-                    it.stopNode()
-                    deferredNode
                     deferredNode.start(it) { exception ->
                         if (exception != null) {
                             _nodeStartingError.postValue(exception)

diff --git a/android/app/src/main/res/layout/activity_profile.xml b/android/app/src/main/res/layout/activity_profile.xml
@@ -93,8 +93,6 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/margin_padding_size_medium_large"
             android:layout_marginTop="@dimen/margin_padding_size_small"
-            android:maxLines="2"
-            android:minLines="2"
             android:text="@string/profile_identity_description"
             android:textAlignment="center"
             android:textColor="@color/manual_connect_value_white"
@@ -196,8 +194,6 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/margin_padding_size_medium_large"
             android:layout_marginTop="@dimen/margin_padding_size_small"
-            android:maxLines="3"
-            android:minLines="3"
             android:text="@string/profile_keys_description"
             android:textAlignment="center"
             android:textColor="@color/manual_connect_value_white"

diff --git a/android/app/src/main/res/layout/item_menu.xml b/android/app/src/main/res/layout/item_menu.xml
@@ -38,10 +38,12 @@
     <TextView
         android:id="@+id/itemTitleTextView"
         style="@style/TextAppearance.Headline"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_padding_size_medium"
         android:textAlignment="center"
+        android:gravity="center"
+        android:layout_marginHorizontal="@dimen/margin_padding_size_small"
         android:textColor="@android:color/white"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -57,6 +59,7 @@
         android:layout_marginTop="@dimen/margin_padding_size_xsmall"
         android:layout_marginBottom="@dimen/margin_padding_size_small_medium"
         android:textAlignment="center"
+        android:gravity="center"
         android:textColor="@color/menu_subtitle_light_pink"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/fastlane/android_version_code b/fastlane/android_version_code
@@ -1 +1 @@
-107116
+107117