diff options
author | cyberta <cyberta@riseup.net> | 2024-01-25 23:41:42 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2024-01-25 23:41:42 +0000 |
commit | 5bf3f807a4804c18b7dc88e07e4e34ecf0791713 (patch) | |
tree | a092fd4ab72d1a31daa3cc442331cbb05d034ef0 /app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java | |
parent | ce8106f60d83ee2a788f1920437a0bbd48d6b15f (diff) | |
parent | e84289ab4380ae61cc9f2a86da9a16d1aae45cbd (diff) |
Merge branch 'post_release_work' into 'master'
post release tweaks and fixes
Closes #9150 and #8983
See merge request leap/bitmask_android!264
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java b/app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java index 370a7af6..d85e0a75 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/BitmaskTileService.java @@ -8,6 +8,8 @@ import android.os.Build; import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.Observable; import java.util.Observer; @@ -19,7 +21,7 @@ import se.leap.bitmaskclient.base.models.ProviderObservable; @TargetApi(Build.VERSION_CODES.N) -public class BitmaskTileService extends TileService implements Observer { +public class BitmaskTileService extends TileService implements PropertyChangeListener { @SuppressLint("Override") @TargetApi(Build.VERSION_CODES.N) @@ -59,7 +61,7 @@ public class BitmaskTileService extends TileService implements Observer { public void onStartListening() { super.onStartListening(); EipStatus.getInstance().addObserver(this); - update(EipStatus.getInstance(), null); + propertyChange(new PropertyChangeEvent(EipStatus.getInstance(), EipStatus.PROPERTY_CHANGE, null, EipStatus.getInstance())); } @Override @@ -69,16 +71,15 @@ public class BitmaskTileService extends TileService implements Observer { } @Override - public void update(Observable o, Object arg) { + public void propertyChange(PropertyChangeEvent evt) { Tile t = getQsTile(); // Tile t should never be null according to https://developer.android.com/reference/kotlin/android/service/quicksettings/TileService. // Hovever we've got crash reports. if (t == null) { return; } - - if (o instanceof EipStatus) { - EipStatus status = (EipStatus) o; + if (EipStatus.PROPERTY_CHANGE.equals(evt.getPropertyName())) { + EipStatus status = (EipStatus) evt.getNewValue(); Icon icon; String title; if (status.isConnecting() || status.isReconnecting()) { |