9 files changed, 8 insertions, 14 deletions
diff --git a/app/src/main/res/layout/tunnel_detail_fragment.xml b/app/src/main/res/layout/tunnel_detail_fragment.xml
index 40a79eb7..463f8b80 100644
--- a/app/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/app/src/main/res/layout/tunnel_detail_fragment.xml
@@ -5,7 +5,7 @@
 
     <data>
 
-        <import type="com.wireguard.android.model.Tunnel.State" />
+        <import type="com.wireguard.android.backend.Tunnel.State" />
 
         <import type="com.wireguard.android.util.ClipboardUtils" />
 
@@ -15,7 +15,7 @@
 
         <variable
             name="tunnel"
-            type="com.wireguard.android.model.Tunnel" />
+            type="com.wireguard.android.model.ObservableTunnel" />
 
         <variable
             name="config"
diff --git a/app/src/main/res/layout/tunnel_list_fragment.xml b/app/src/main/res/layout/tunnel_list_fragment.xml
index c4247019..c8144dbb 100644
--- a/app/src/main/res/layout/tunnel_list_fragment.xml
+++ b/app/src/main/res/layout/tunnel_list_fragment.xml
@@ -5,7 +5,7 @@
 
     <data>
 
-        <import type="com.wireguard.android.model.Tunnel" />
+        <import type="com.wireguard.android.model.ObservableTunnel" />
 
         <variable
             name="fragment"
@@ -17,7 +17,7 @@
 
         <variable
             name="tunnels"
-            type="com.wireguard.android.util.ObservableKeyedList&lt;String, Tunnel&gt;" />
+            type="com.wireguard.android.util.ObservableKeyedList&lt;String, ObservableTunnel&gt;" />
     </data>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
diff --git a/app/src/main/res/layout/tunnel_list_item.xml b/app/src/main/res/layout/tunnel_list_item.xml
index 1cca9453..04c0f51e 100644
--- a/app/src/main/res/layout/tunnel_list_item.xml
+++ b/app/src/main/res/layout/tunnel_list_item.xml
@@ -5,13 +5,13 @@
 
     <data>
 
-        <import type="com.wireguard.android.model.Tunnel" />
+        <import type="com.wireguard.android.model.ObservableTunnel" />
 
-        <import type="com.wireguard.android.model.Tunnel.State" />
+        <import type="com.wireguard.android.backend.Tunnel.State" />
 
         <variable
             name="collection"
-            type="com.wireguard.android.util.ObservableKeyedList&lt;String, Tunnel&gt;" />
+            type="com.wireguard.android.util.ObservableKeyedList&lt;String, ObservableTunnel&gt;" />
 
         <variable
             name="key"
@@ -19,7 +19,7 @@
 
         <variable
             name="item"
-            type="com.wireguard.android.model.Tunnel" />
+            type="com.wireguard.android.model.ObservableTunnel" />
 
         <variable
             name="fragment"
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 46785bc1..a9f01861 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -104,7 +104,6 @@
     <string name="module_installer_working">डाउनलोड कर रहा है और स्थापित कर रहा है…</string>
     <string name="module_installer_error">कुछ गलत हो गया। कृपया पुन: प्रयास करें</string>
     <string name="mtu">MTU</string>
-    <string name="multiple_tunnels_error">एक समय में केवल एक यूजरस्पेस टनल ही चल सकता है</string>
     <string name="name">नाम</string>
     <string name="no_config_error">बिना किसी कॉन्फ़िगरेशन के एक टनल को लाने की कोशिश करना</string>
     <string name="no_configs_error">कोई कॉन्फ़िगरेशन नहीं मिला</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a7bd29cb..b76c39cd 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -104,7 +104,6 @@
     <string name="module_installer_working">Scaricamento e installazione…</string>
     <string name="module_installer_error">Qualcosa è andato storto. Riprova</string>
     <string name="mtu">MTU</string>
-    <string name="multiple_tunnels_error">Può essere attivo solo un tunnel su spazio utente alla volta</string>
     <string name="name">Nome</string>
     <string name="no_config_error">Tentativo di attivare un tunnel senza configurazione</string>
     <string name="no_configs_error">Nessuna configurazione trovata</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 16cd165e..22d1b72f 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -98,7 +98,6 @@
     <string name="module_installer_working">ダウンロードしてインストールしています…</string>
     <string name="module_installer_error">失敗しました. 再度実行してみてください</string>
     <string name="mtu">MTU</string>
-    <string name="multiple_tunnels_error">同時に実行できるユーザースペーストンネルは1つだけです</string>
     <string name="name">名前</string>
     <string name="no_config_error">未設定のままトンネルを起動しようとしています</string>
     <string name="no_configs_error">設定が見つかりません</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 0add655c..c8f1b8aa 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -104,7 +104,6 @@
     <string name="module_installer_working">Скачивание и установка…</string>
     <string name="module_installer_error">Что-то пошло не так. Пожалуйста, попробуйте еще раз</string>
     <string name="mtu">MTU</string>
-    <string name="multiple_tunnels_error">Только один пользовательский туннель может работать одновременно</string>
     <string name="name">Имя</string>
     <string name="no_config_error">Попытка поднять туннель без конфигурации</string>
     <string name="no_configs_error">Конфигурации не найдены</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 26ca0232..8f7ab987 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -98,7 +98,6 @@
     <string name="module_installer_working">正在下载安装...</string>
     <string name="module_installer_error">发生错误，请重试</string>
     <string name="mtu">MTU</string>
-    <string name="multiple_tunnels_error">用户空间内一次只能建立一个连接</string>
     <string name="name">名称</string>
     <string name="no_config_error">尝试在无配置情况下建立连接</string>
     <string name="no_configs_error">未找到配置</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 91bbf0f1..45964eec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,7 +104,6 @@
     <string name="module_installer_working">Downloading and installing…</string>
     <string name="module_installer_error">Something went wrong. Please try again</string>
     <string name="mtu">MTU</string>
-    <string name="multiple_tunnels_error">Only one userspace tunnel can run at a time</string>
     <string name="name">Name</string>
     <string name="no_config_error">Trying to bring up a tunnel with no config</string>
     <string name="no_configs_error">No configurations found</string>