1 files changed, 20 insertions, 4 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/ProviderObservable.java b/app/src/main/java/se/leap/bitmaskclient/base/models/ProviderObservable.java
index 3e1e1fcc..6e28ac3e 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/ProviderObservable.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/ProviderObservable.java
@@ -2,13 +2,17 @@ package se.leap.bitmaskclient.base.models;
 
 import androidx.annotation.NonNull;
 
-import java.util.Observable;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
 
 /**
  * Created by cyberta on 05.12.18.
  */
-public class ProviderObservable extends Observable {
+public class ProviderObservable {
     private static ProviderObservable instance;
+    private final PropertyChangeSupport changeSupport;
+    public static final String PROPERTY_CHANGE = "ProviderObservable";
+
     private Provider currentProvider;
     private Provider providerForDns;
 
@@ -19,11 +23,23 @@ public class ProviderObservable extends Observable {
         return instance;
     }
 
+    private ProviderObservable() {
+        changeSupport = new PropertyChangeSupport(this);
+        currentProvider = new Provider();
+    }
+
+    public void addObserver(PropertyChangeListener propertyChangeListener) {
+        changeSupport.addPropertyChangeListener(propertyChangeListener);
+    }
+
+    public void deleteObserver(PropertyChangeListener propertyChangeListener) {
+        changeSupport.removePropertyChangeListener(propertyChangeListener);
+    }
+
     public synchronized void updateProvider(@NonNull Provider provider) {
         instance.currentProvider = provider;
         instance.providerForDns = null;
-        instance.setChanged();
-        instance.notifyObservers();
+        instance.changeSupport.firePropertyChange(PROPERTY_CHANGE, null, provider);
     }
 
     public Provider getCurrentProvider() {