Use actual path data, clean and fix incorrect copy

2025-12-03 05:52:34 +00:00 · 2020-05-29 09:43:03 +10:00
parent c7adf9f232
commit 326b5a9475
6 changed files with 108 additions and 60 deletions
--- a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
@@ -1,23 +1,27 @@
 package org.thoughtcrime.securesms.loki.activities

-import android.animation.FloatEvaluator
-import android.animation.ValueAnimator
 import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
-import android.support.annotation.DimenRes
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.Gravity
+import android.view.Menu
+import android.view.MenuItem
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.TextView
+import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_path.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.loki.utilities.animateSizeChange
 import org.thoughtcrime.securesms.loki.utilities.getColorWithID
-import org.thoughtcrime.securesms.loki.views.NewConversationButtonSetView
+import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI
+import org.whispersystems.signalservice.loki.api.onionrequests.Snode

 class PathActivity : PassphraseRequiredActionBarActivity() {

@@ -27,23 +31,36 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
        setContentView(R.layout.activity_path)
        supportActionBar!!.title = resources.getString(R.string.activity_path_title)
        val youRow = getPathRow("You", null, LineView.Location.Top, 1000, 4000)
-        val row1 = getPathRow("Guard Node", "0.0.0.0", LineView.Location.Middle, 2000, 4000)
-        val row2 = getPathRow("Service Node", "0.0.0.0", LineView.Location.Middle, 3000, 4000)
-        val row3 = getPathRow("Service Node", "0.0.0.0", LineView.Location.Middle, 4000, 4000)
+        val path = OnionRequestAPI.paths.firstOrNull() ?: return finish()
+        val pathRows = path.mapIndexed { index, snode ->
+            val isGuardSnode = (OnionRequestAPI.guardSnodes.contains(snode))
+            getPathRow(snode, LineView.Location.Middle, index.toLong() * 1000 + 2000, 4000, isGuardSnode)
+        }
        val destinationRow = getPathRow("Destination", null, LineView.Location.Bottom, 5000, 4000)
        pathRowsContainer.addView(youRow)
-        pathRowsContainer.addView(row1)
-        pathRowsContainer.addView(row2)
-        pathRowsContainer.addView(row3)
+        for (pathRow in pathRows) {
+            pathRowsContainer.addView(pathRow)
+        }
        pathRowsContainer.addView(destinationRow)
    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.menu_path, menu)
+        return true
+    }
    // endregion

    // region General
    private fun getPathRow(title: String, subtitle: String?, location: LineView.Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long): LinearLayout {
+        val mainContainer = LinearLayout(this)
+        mainContainer.orientation = LinearLayout.HORIZONTAL
+        mainContainer.gravity = Gravity.CENTER_VERTICAL
+        val mainContainerLayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
+        mainContainer.layoutParams = mainContainerLayoutParams
        val lineView = LineView(this, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
        val lineViewLayoutParams = LinearLayout.LayoutParams(resources.getDimensionPixelSize(R.dimen.path_row_expanded_dot_size), resources.getDimensionPixelSize(R.dimen.path_row_height))
        lineView.layoutParams = lineViewLayoutParams
+        mainContainer.addView(lineView)
        val titleTextView = TextView(this)
        titleTextView.setTextColor(resources.getColorWithID(R.color.text, theme))
        titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, resources.getDimension(R.dimen.medium_font_size))
@@ -54,6 +71,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
        val titleContainerLayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
        titleContainerLayoutParams.marginStart = resources.getDimensionPixelSize(R.dimen.large_spacing)
        titleContainer.layoutParams = titleContainerLayoutParams
+        mainContainer.addView(titleContainer)
        if (subtitle != null) {
            val subtitleTextView = TextView(this)
            subtitleTextView.setTextColor(resources.getColorWithID(R.color.text, theme))
@@ -61,15 +79,35 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
            subtitleTextView.text = subtitle
            titleContainer.addView(subtitleTextView)
        }
-        val mainContainer = LinearLayout(this)
-        mainContainer.orientation = LinearLayout.HORIZONTAL
-        mainContainer.gravity = Gravity.CENTER_VERTICAL
-        val mainContainerLayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
-        mainContainer.layoutParams = mainContainerLayoutParams
-        mainContainer.addView(lineView)
-        mainContainer.addView(titleContainer)
        return mainContainer
    }
+
+    private fun getPathRow(snode: Snode, location: LineView.Location, dotAnimationStartDelay: Long, dotAnimationRepeatInterval: Long, isGuardSnode: Boolean): LinearLayout {
+        val title = if (isGuardSnode) resources.getString(R.string.activity_path_guard_node_row_title) else resources.getString(R.string.activity_path_service_node_row_title)
+        val subtitle = snode.toString().removePrefix("https://").substringBefore(":")
+        return getPathRow(title, subtitle, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
+    }
+    // endregion
+
+    // region Interaction
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+        when(id) {
+            R.id.learnMoreButton -> learnMore()
+            else -> { /* Do nothing */ }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun learnMore() {
+        try {
+            val url = "https://getsession.org/faq/#onion-routing"
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+            startActivity(intent)
+        } catch (e: Exception) {
+            Toast.makeText(this, R.string.invalid_url, Toast.LENGTH_SHORT).show()
+        }
+    }
    // endregion

    // region Line View
@@ -147,26 +185,11 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
        }

        private fun expand() {
-            animateDotViewSizeChange(R.dimen.path_row_dot_size, R.dimen.path_row_expanded_dot_size)
+            dotView.animateSizeChange(R.dimen.path_row_dot_size, R.dimen.path_row_expanded_dot_size)
        }

        private fun collapse() {
-            animateDotViewSizeChange(R.dimen.path_row_expanded_dot_size, R.dimen.path_row_dot_size)
-        }
-
-        private fun animateDotViewSizeChange(@DimenRes startSizeID: Int, @DimenRes endSizeID: Int) {
-            val layoutParams = dotView.layoutParams
-            val startSize = resources.getDimension(startSizeID)
-            val endSize = resources.getDimension(endSizeID)
-            val animation = ValueAnimator.ofObject(FloatEvaluator(), startSize, endSize)
-            animation.duration = NewConversationButtonSetView.Button.animationDuration
-            animation.addUpdateListener { animator ->
-                val size = animator.animatedValue as Float
-                layoutParams.width = size.toInt()
-                layoutParams.height = size.toInt()
-                dotView.layoutParams = layoutParams
-            }
-            animation.start()
+            dotView.animateSizeChange(R.dimen.path_row_expanded_dot_size, R.dimen.path_row_dot_size)
        }
    }
    // endregion
--- a/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
@@ -1,7 +1,10 @@
 package org.thoughtcrime.securesms.loki.utilities

+import android.animation.FloatEvaluator
+import android.animation.ValueAnimator
 import android.graphics.PointF
 import android.graphics.Rect
+import android.support.annotation.DimenRes
 import android.view.View

 fun View.contains(point: PointF): Boolean {
@@ -13,4 +16,19 @@ val View.hitRect: Rect
        val rect = Rect()
        getHitRect(rect)
        return rect
-    }
+    }
+
+fun View.animateSizeChange(@DimenRes startSizeID: Int, @DimenRes endSizeID: Int, animationDuration: Long = 250) {
+    val layoutParams = this.layoutParams
+    val startSize = resources.getDimension(startSizeID)
+    val endSize = resources.getDimension(endSizeID)
+    val animation = ValueAnimator.ofObject(FloatEvaluator(), startSize, endSize)
+    animation.duration = animationDuration
+    animation.addUpdateListener { animator ->
+        val size = animator.animatedValue as Float
+        layoutParams.width = size.toInt()
+        layoutParams.height = size.toInt()
+        this.layoutParams = layoutParams
+    }
+    animation.start()
+}
--- a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
@@ -96,13 +96,13 @@ class NewConversationButtonSetView : RelativeLayout {

        fun expand() {
            animateImageViewColorChange(R.color.new_conversation_button_collapsed_background, R.color.accent)
-            animateImageViewSizeChange(R.dimen.new_conversation_button_collapsed_size, R.dimen.new_conversation_button_expanded_size)
+            imageView.animateSizeChange(R.dimen.new_conversation_button_collapsed_size, R.dimen.new_conversation_button_expanded_size, animationDuration)
            animateImageViewPositionChange(collapsedImageViewPosition, expandedImageViewPosition)
        }

        fun collapse() {
            animateImageViewColorChange(R.color.accent, R.color.new_conversation_button_collapsed_background)
-            animateImageViewSizeChange(R.dimen.new_conversation_button_expanded_size, R.dimen.new_conversation_button_collapsed_size)
+            imageView.animateSizeChange(R.dimen.new_conversation_button_expanded_size, R.dimen.new_conversation_button_collapsed_size, animationDuration)
            animateImageViewPositionChange(expandedImageViewPosition, collapsedImageViewPosition)
        }

@@ -119,21 +119,6 @@ class NewConversationButtonSetView : RelativeLayout {
            animation.start()
        }

-        private fun animateImageViewSizeChange(@DimenRes startSizeID: Int, @DimenRes endSizeID: Int) {
-            val layoutParams = imageView.layoutParams
-            val startSize = resources.getDimension(startSizeID)
-            val endSize = resources.getDimension(endSizeID)
-            val animation = ValueAnimator.ofObject(FloatEvaluator(), startSize, endSize)
-            animation.duration = animationDuration
-            animation.addUpdateListener { animator ->
-                val size = animator.animatedValue as Float
-                layoutParams.width = size.toInt()
-                layoutParams.height = size.toInt()
-                imageView.layoutParams = layoutParams
-            }
-            animation.start()
-        }
-
        private fun animateImageViewPositionChange(startPosition: PointF, endPosition: PointF) {
            val animation = ValueAnimator.ofObject(PointFEvaluator(), startPosition, endPosition)
            animation.duration = animationDuration