summaryrefslogtreecommitdiffhomepage
path: root/app/src
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2017-08-16 00:57:27 -0500
committerSamuel Holland <samuel@sholland.org>2017-08-16 00:57:27 -0500
commitf1d97a585a66613a1080cde7bb9b6d633ecc4582 (patch)
treea641c03a8d38a7a6b54fbbd58685d8189909ae10 /app/src
parentb60536222dc4be5154c57477d2746a1ea45384a1 (diff)
Config: Rename function to make databinding happy
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/com/wireguard/android/VpnService.java8
-rw-r--r--app/src/main/java/com/wireguard/config/Config.java2
2 files changed, 5 insertions, 5 deletions
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);
}