Removed tree info from main screen.

app/src/main/java/eu/neilalexander/yggdrasil/MainActivity.kt

@@ -24,7 +24,6 @@ class MainActivity : AppCompatActivity() {
     private lateinit var enabledLabel: TextView
     private lateinit var ipAddressLabel: TextView
     private lateinit var subnetLabel: TextView
-    private lateinit var treeLengthLabel: TextView
     private lateinit var peersLabel: TextView
     private lateinit var peersRow: LinearLayoutCompat
     private lateinit var dnsLabel: TextView
@@ -53,7 +52,6 @@ class MainActivity : AppCompatActivity() {
         enabledLabel = findViewById(R.id.yggdrasilStatusLabel)
         ipAddressLabel = findViewById(R.id.ipAddressValue)
         subnetLabel = findViewById(R.id.subnetValue)
-        treeLengthLabel = findViewById(R.id.treeLengthValue)
         peersLabel = findViewById(R.id.peersValue)
         peersRow = findViewById(R.id.peersTableRow)
         dnsLabel = findViewById(R.id.dnsValue)
@@ -175,7 +173,6 @@ class MainActivity : AppCompatActivity() {
                     }
                     ipAddressLabel.text = intent.getStringExtra("ip") ?: "N/A"
                     subnetLabel.text = intent.getStringExtra("subnet") ?: "N/A"
-                    treeLengthLabel.text = intent.getStringExtra("coords") ?: "0"
                     if (intent.hasExtra("peers")) {
                         val peerState = JSONArray(intent.getStringExtra("peers") ?: "[]")
                         peersLabel.text = when (val count = peerState.length()) {

app/src/main/java/eu/neilalexander/yggdrasil/PacketTunnelProvider.kt

@@ -236,11 +236,6 @@ open class PacketTunnelProvider: VpnService() {
         var lastStateUpdate = System.currentTimeMillis()
         updates@ while (started.get()) {
             val treeJSON = yggdrasil.treeJSON
-            var treeLength = 0
-            if (treeJSON != null && treeJSON != "null") {
-                val treeState = JSONArray(treeJSON)
-                treeLength = treeState.length()
-            }
             if ((application as  GlobalApplication).needUiUpdates()) {
                 val intent = Intent(STATE_INTENT)
                 intent.putExtra("type", "state")
@@ -248,9 +243,7 @@ open class PacketTunnelProvider: VpnService() {
                 intent.putExtra("ip", yggdrasil.addressString)
                 intent.putExtra("subnet", yggdrasil.subnetString)
                 intent.putExtra("pubkey", yggdrasil.publicKeyString)
-                intent.putExtra("coords", "$treeLength")
                 intent.putExtra("peers", yggdrasil.peersJSON)
-                intent.putExtra("tree", treeJSON)
                 LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
             }
             val curTime = System.currentTimeMillis()

app/src/main/res/layout/activity_main.xml

@@ -116,7 +116,7 @@
                         android:layout_height="32px" />
 
                     <TextView
-                        android:id="@+id/statisticsSectionLabel"
+                        android:id="@+id/networkInfoSectionLabel"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16pt"
@@ -126,7 +126,7 @@
                         android:layout_marginBottom="2pt"
                         android:alpha="0.7"
                         android:paddingRight="8pt"
-                        android:text="@string/main_statistics"
+                        android:text="@string/main_network_info"
                         android:textAllCaps="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
                         android:textSize="12sp" />
@@ -203,32 +203,6 @@
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
-                        <androidx.appcompat.widget.LinearLayoutCompat style="@style/SelectableItemStyle">
-
-                            <TextView
-                                android:id="@+id/coordinatesLabel"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="0"
-                                android:text="@string/main_tree_length"
-                                android:textColor="?attr/textDefault" />
-
-                            <TextView
-                                android:id="@+id/treeLengthValue"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:alpha="0.5"
-                                android:ellipsize="end"
-                                android:maxLines="1"
-                                android:scrollHorizontally="false"
-                                android:selectAllOnFocus="true"
-                                android:singleLine="true"
-                                android:text="0"
-                                android:textAlignment="viewEnd"
-                                android:textIsSelectable="true" />
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
                     <Space

app/src/main/res/values-ru/strings.xml

@@ -42,11 +42,10 @@
     <string name="settings_reset">Сброс</string>
     <string name="main_status">Состояние</string>
     <string name="main_enable_yggdrasil">Включить Yggdrasil</string>
-    <string name="main_statistics">Статистика</string>
+    <string name="main_network_info">Адрес и сеть</string>
     <string name="main_not_available">Н/Д</string>
     <string name="main_ip">Адрес</string>
     <string name="main_subnet">Подсеть</string>
-    <string name="main_tree_length">Высота дерева</string>
     <string name="main_configuration">Конфигурация</string>
     <string name="main_peers">Пиры</string>
     <string name="main_dns_servers">Серверы DNS</string>

app/src/main/res/values/strings.xml

@@ -42,11 +42,10 @@
     <string name="settings_reset">Reset</string>
     <string name="main_status">Status</string>
     <string name="main_enable_yggdrasil">Enable Yggdrasil</string>
-    <string name="main_statistics">Statistics</string>
+    <string name="main_network_info">Network info</string>
     <string name="main_not_available">N/A</string>
     <string name="main_ip">IP</string>
     <string name="main_subnet">Subnet</string>
-    <string name="main_tree_length">Tree length</string>
     <string name="main_configuration">Configuration</string>
     <string name="main_peers">Peers</string>
     <string name="main_dns_servers">DNS servers</string>