commit 11cb7d37c4d9d8583e805a856fc19d2d44bdd370
author maxwen <max.weninger@gmail.com> Fri Feb 11 00:52:26 2022 +0100
committer maxwen <max.weninger@gmail.com> Sun Feb 13 23:09:21 2022 +0100
tree 5364072a7438c564d30a72be72fec877ff709788
parent 75f06b1bc415e082edff81fb35a98aed0863ed9c

[1/2] OmniLib: update OmniJawsClient

there is no more WeatherService to use

Change-Id: I60965ee6a8fbe3307530976c49d663f18ca0ad2a

src/org/omnirom/omnilib/weather/OmniJawsClient.java

diff --git a/src/org/omnirom/omnilib/weather/OmniJawsClient.java b/src/org/omnirom/omnilib/weather/OmniJawsClient.java
index 923019f..b6b771a 100644
--- a/src/org/omnirom/omnilib/weather/OmniJawsClient.java
+++ b/src/org/omnirom/omnilib/weather/OmniJawsClient.java
@@ -83,8 +83,8 @@
             "icon_pack"
     };
 
-    private static final String WEATHER_UPDATE = "org.omnirom.omnijaws.WEATHER_UPDATE";
-    private static final String WEATHER_ERROR = "org.omnirom.omnijaws.WEATHER_ERROR";
+    private static final String WEATHER_UPDATE = SERVICE_PACKAGE + ".WEATHER_UPDATE";
+    private static final String WEATHER_ERROR = SERVICE_PACKAGE + ".WEATHER_ERROR";
 
     private static final DecimalFormat sNoDigitsFormat = new DecimalFormat("0");
 
@@ -157,41 +157,16 @@
     private boolean mMetric;
     private List<OmniJawsObserver> mObserver;
     private WeatherUpdateReceiver mReceiver;
-    private Handler mHandler = new Handler();
 
     public OmniJawsClient(Context context) {
         mContext = context;
         mObserver = new ArrayList<OmniJawsObserver>();
     }
 
-    public OmniJawsClient(Context context, boolean settingsObserver) {
-        mContext = context;
-        mObserver = new ArrayList<OmniJawsObserver>();
-    }
-
-    public void cleanupObserver() {
-        if (mReceiver != null) {
-            try {
-                mContext.unregisterReceiver(mReceiver);
-            } catch (Exception e) {
-            }
-            mReceiver = null;
-        }
-    }
-
-    public void updateWeather() {
-        if (isOmniJawsServiceInstalled()) {
-            Intent updateIntent = new Intent(Intent.ACTION_MAIN)
-                    .setClassName(SERVICE_PACKAGE, SERVICE_PACKAGE + ".WeatherService");
-            updateIntent.setAction(SERVICE_PACKAGE + ".ACTION_UPDATE");
-            mContext.startService(updateIntent);
-        }
-    }
-
     public Intent getSettingsIntent() {
         if (isOmniJawsServiceInstalled()) {
             Intent settings = new Intent(Intent.ACTION_MAIN)
-                    .setClassName("org.omnirom.omnijaws", "org.omnirom.omnijaws.SettingsActivity");
+                    .setClassName(SERVICE_PACKAGE, SERVICE_PACKAGE + ".SettingsActivity");
             return settings;
         }
         return null;
@@ -200,7 +175,7 @@
     public Intent getWeatherActivityIntent() {
         if (isOmniJawsServiceInstalled()) {
             Intent settings = new Intent(Intent.ACTION_MAIN)
-                    .setClassName("org.omnirom.omnijaws", "org.omnirom.omnijaws.WeatherActivity");
+                    .setClassName(SERVICE_PACKAGE, SERVICE_PACKAGE + ".WeatherActivity");
             return settings;
         }
         return null;
@@ -405,18 +380,6 @@
         return false;
     }
 
-    public void setOmniJawsEnabled(boolean value) {
-        if (isOmniJawsServiceInstalled()) {
-            // check first time enablement and redirect to settings
-            // cause we need to enable gps for it
-            Intent updateIntent = new Intent(Intent.ACTION_MAIN)
-                    .setClassName(SERVICE_PACKAGE, SERVICE_PACKAGE + ".WeatherService");
-            updateIntent.setAction(SERVICE_PACKAGE + ".ACTION_ENABLE");
-            updateIntent.putExtra("enable", value);
-            mContext.startService(updateIntent);
-        }
-    }
-
     public boolean isOmniJawsSetupDone() {
         if (!isOmniJawsServiceInstalled()) {
             return false;
@@ -480,6 +443,7 @@
             IntentFilter filter = new IntentFilter();
             filter.addAction(WEATHER_UPDATE);
             filter.addAction(WEATHER_ERROR);
+            if (DEBUG) Log.d(TAG, "registerReceiver");
             mContext.registerReceiver(mReceiver, filter);
         }
         mObserver.add(observer);
@@ -489,6 +453,7 @@
         mObserver.remove(observer);
         if (mObserver.size() == 0 && mReceiver != null) {
             try {
+                if (DEBUG) Log.d(TAG, "unregisterReceiver");
                 mContext.unregisterReceiver(mReceiver);
             } catch (Exception e) {
             }