From 6cb67148933f9cc94a444bf333a34279dfd47a29 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 2 Jun 2020 15:22:32 +1000
Subject: [PATCH] Ditch rebuild path button

---
 res/layout/activity_path.xml                  |  4 +--
 res/menu/menu_path.xml                        | 10 -------
 res/values/strings.xml                        |  2 +-
 .../securesms/loki/activities/PathActivity.kt | 26 +------------------
 4 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 res/menu/menu_path.xml

diff --git a/res/layout/activity_path.xml b/res/layout/activity_path.xml
index 6dd8dff316..63d549c9b2 100644
--- a/res/layout/activity_path.xml
+++ b/res/layout/activity_path.xml
@@ -45,10 +45,10 @@
 
     <Button
         style="@style/MediumProminentOutlineButton"
-        android:id="@+id/rebuildPathButton"
+        android:id="@+id/learnMoreButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginBottom="@dimen/medium_spacing"
-        android:text="@string/activity_path_rebuild_path_button_title" />
+        android:text="@string/activity_path_learn_more_button_title" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/menu/menu_path.xml b/res/menu/menu_path.xml
deleted file mode 100644
index eaeb00d586..0000000000
--- a/res/menu/menu_path.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/learnMoreButton"
-        android:icon="@drawable/ic_question_mark"
-        app:showAsAction="always" />
-
-</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 38f1f41b42..a3675c5a71 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1747,7 +1747,7 @@
     <string name="activity_path_guard_node_row_title">Guard Node</string>
     <string name="activity_path_service_node_row_title">Service Node</string>
     <string name="activity_path_destination_row_title">Destination</string>
-    <string name="activity_path_rebuild_path_button_title">Rebuild Path</string>
+    <string name="activity_path_learn_more_button_title">Learn More</string>
 
     <string name="activity_create_private_chat_title">New Session</string>
     <string name="activity_create_private_chat_enter_session_id_tab_title">Enter Session ID</string>
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
index 56d5c7f4a1..71c49d99e9 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
@@ -11,8 +11,6 @@ import android.support.v4.content.LocalBroadcastManager
 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
@@ -21,7 +19,6 @@ 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.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.*
 import org.whispersystems.signalservice.loki.api.Snode
 import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI
@@ -34,7 +31,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         super.onCreate(savedInstanceState, isReady)
         setContentView(R.layout.activity_path)
         supportActionBar!!.title = resources.getString(R.string.activity_path_title)
-        rebuildPathButton.setOnClickListener { rebuildPath() }
+        learnMoreButton.setOnClickListener { learnMore() }
         update(false)
         registerObservers()
     }
@@ -58,11 +55,6 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         LocalBroadcastManager.getInstance(this).registerReceiver(pathsBuiltReceiver, IntentFilter("pathsBuilt"))
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.menu_path, menu)
-        return true
-    }
-
     override fun onDestroy() {
         for (receiver in broadcastReceivers) {
             LocalBroadcastManager.getInstance(this).unregisterReceiver(receiver)
@@ -145,15 +137,6 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
     // 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"
@@ -163,13 +146,6 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
             Toast.makeText(this, R.string.invalid_url, Toast.LENGTH_SHORT).show()
         }
     }
-
-    private fun rebuildPath() {
-        DatabaseFactory.getLokiAPIDatabase(this).clearOnionRequestPaths()
-        OnionRequestAPI.guardSnodes = setOf()
-        OnionRequestAPI.paths = listOf()
-        OnionRequestAPI.buildPaths()
-    }
     // endregion
 
     // region Line View