diff --git a/res/layout/activity_path.xml b/res/layout/activity_path.xml
index 6dd8dff31..63d549c9b 100644
--- a/res/layout/activity_path.xml
+++ b/res/layout/activity_path.xml
@@ -45,10 +45,10 @@
+ android:text="@string/activity_path_learn_more_button_title" />
\ 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 eaeb00d58..000000000
--- a/res/menu/menu_path.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 38f1f41b4..a3675c5a7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1747,7 +1747,7 @@
Guard Node
Service Node
Destination
- Rebuild Path
+ Learn More
New Session
Enter Session ID
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
index 56d5c7f4a..71c49d99e 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