From f1d97a585a66613a1080cde7bb9b6d633ecc4582 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Wed, 16 Aug 2017 00:57:27 -0500
Subject: Config: Rename function to make databinding happy

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 app/src/main/java/com/wireguard/android/VpnService.java | 8 ++++----
 app/src/main/java/com/wireguard/config/Config.java      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/src/main/java/com/wireguard')

diff --git a/app/src/main/java/com/wireguard/android/VpnService.java b/app/src/main/java/com/wireguard/android/VpnService.java
index 920dd78e..60ed3c4f 100644
--- a/app/src/main/java/com/wireguard/android/VpnService.java
+++ b/app/src/main/java/com/wireguard/android/VpnService.java
@@ -178,7 +178,7 @@ public class VpnService extends Service {
         protected void onPostExecute(final Boolean result) {
             if (!result)
                 return;
-            config.setEnabled(false);
+            config.setIsEnabled(false);
         }
     }
 
@@ -200,7 +200,7 @@ public class VpnService extends Service {
         protected void onPostExecute(final Boolean result) {
             if (!result)
                 return;
-            config.setEnabled(true);
+            config.setIsEnabled(true);
         }
     }
 
@@ -228,7 +228,7 @@ public class VpnService extends Service {
                 try {
                     final Config config = new Config();
                     config.parseFrom(openFileInput(fileName));
-                    config.setEnabled(interfaces.contains(configName));
+                    config.setIsEnabled(interfaces.contains(configName));
                     config.setName(configName);
                     configs.add(config);
                 } catch (IllegalArgumentException | IOException e) {
@@ -335,7 +335,7 @@ public class VpnService extends Service {
                 oldConfig.copyFrom(newConfig);
                 newConfig = oldConfig;
             }
-            newConfig.setEnabled(false);
+            newConfig.setIsEnabled(false);
             configurations.put(newName, newConfig);
             if (shouldConnect)
                 new ConfigEnabler(newConfig).execute();
diff --git a/app/src/main/java/com/wireguard/config/Config.java b/app/src/main/java/com/wireguard/config/Config.java
index 3fe069a1..414b4894 100644
--- a/app/src/main/java/com/wireguard/config/Config.java
+++ b/app/src/main/java/com/wireguard/config/Config.java
@@ -90,7 +90,7 @@ public class Config extends BaseObservable implements Copyable<Config>, Observab
         }
     }
 
-    public void setEnabled(final boolean isEnabled) {
+    public void setIsEnabled(final boolean isEnabled) {
         this.isEnabled = isEnabled;
         notifyPropertyChanged(BR.enabled);
     }
-- 
cgit v1.2.3