From 10fae9e4f5b4bc00580f7972ad0a3e07bb680bfb Mon Sep 17 00:00:00 2001
From: pacien
Date: Sat, 24 Feb 2018 01:50:02 +0100
Subject: Replace node list loading placeholder

---
 app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt | 2 +-
 app/src/main/res/layout/fragment_network_status_header.xml        | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml                        | 1 -
 app/src/main/res/values-zh-rHK/strings.xml                        | 1 -
 app/src/main/res/values-zh-rTW/strings.xml                        | 1 -
 app/src/main/res/values/strings.xml                               | 2 +-
 6 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
index c4873d8..0726ee9 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -137,7 +137,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
 
   private fun writeNodeList(nodeList: List<String>) = runOnUiThread {
     nodeListAdapter?.setElements(nodeList)
-    node_list_placeholder.visibility = if (nodeListAdapter?.isEmpty != false) View.VISIBLE else View.GONE
+    node_list_placeholder.visibility = View.GONE
     list_wrapper.isRefreshing = false
   }
 
diff --git a/app/src/main/res/layout/fragment_network_status_header.xml b/app/src/main/res/layout/fragment_network_status_header.xml
index cde547c..e550c5a 100644
--- a/app/src/main/res/layout/fragment_network_status_header.xml
+++ b/app/src/main/res/layout/fragment_network_status_header.xml
@@ -122,6 +122,6 @@
 	<TextView
 		android:id="@+id/node_list_placeholder"
 		style="@style/AppTheme.ListBlock.Placeholder"
-		android:text="@string/message_no_known_node"/>
+		android:text="@string/message_loading"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c413afb..ce0a854 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -63,7 +63,6 @@
 	<string name="action_encrypt_decrypt_private_keys">加密或解密私钥</string>
 
 	<string name="message_no_network_configuration_found">未找到网络配置。</string>
-	<string name="message_no_known_node">没有已知的节点</string>
 	<string name="message_generating_configuration">生成节点配置…</string>
 	<string name="message_joining_network">加入网络…</string>
 	<string name="message_network_configuration_written">网络配置写入成功。</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 0301fda..6879117 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -63,7 +63,6 @@
 	<string name="action_encrypt_decrypt_private_keys">加密或解密私鑰</string>
 
 	<string name="message_no_network_configuration_found">未找到網絡配置。</string>
-	<string name="message_no_known_node">沒有已知的節點</string>
 	<string name="message_generating_configuration">生成節點配置…</string>
 	<string name="message_joining_network">加入網絡…</string>
 	<string name="message_network_configuration_written">網絡配置寫入成功。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 68787d7..3c9927f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -63,7 +63,6 @@
 	<string name="action_encrypt_decrypt_private_keys">加密或解密私鑰</string>
 
 	<string name="message_no_network_configuration_found">未找到網路配置。</string>
-	<string name="message_no_known_node">沒有已知的節點</string>
 	<string name="message_generating_configuration">生成節點配置…</string>
 	<string name="message_joining_network">加入網路…</string>
 	<string name="message_network_configuration_written">網路配置寫入成功。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fed15f0..14d1180 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,7 +64,6 @@
 	<string name="action_dismiss">Dismiss</string>
 
 	<string name="message_no_network_configuration_found">No network configuration has been found.</string>
-	<string name="message_no_known_node">No known node</string>
 	<string name="message_generating_configuration">Generating node configuration…</string>
 	<string name="message_joining_network">Joining network…</string>
 	<string name="message_network_configuration_written">Network configuration successfully written.</string>
@@ -80,6 +79,7 @@
 	<string name="message_disconnecting_vpn">Disconnecting VPN…</string>
 	<string name="message_passphrase_required">A passphrase is required to unlock the keyring.</string>
 	<string name="message_daemon_exited">Tinc daemon exited during startup:\n%1$s\n\nCheck the logs for more details.</string>
+	<string name="message_loading">Loading…</string>
 
 	<string name="value_none">none</string>
 	<string name="value_yes">yes</string>
-- 
cgit v1.2.3