Merge branch '5381-duplicate-widgets' into 'master'

Don't add widget if it already exists

See merge request !89

app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java

@@ -143,7 +143,6 @@ import foundation.e.blisslauncher.features.suggestions.SuggestionProvider;
 import foundation.e.blisslauncher.features.suggestions.SuggestionsResult;
 import foundation.e.blisslauncher.features.usagestats.AppUsageStats;
 import foundation.e.blisslauncher.features.weather.DeviceStatusService;
-import foundation.e.blisslauncher.features.weather.WeatherAppWidgetProvider;
 import foundation.e.blisslauncher.features.weather.WeatherPreferences;
 import foundation.e.blisslauncher.features.weather.WeatherSourceListenerService;
 import foundation.e.blisslauncher.features.weather.WeatherUpdateService;
@@ -420,22 +419,30 @@ public class LauncherActivity extends AppCompatActivity implements
     }
 
     private void addDefaultWidgets() {
+        int[] widgetIds = mAppWidgetHost.getAppWidgetIds();
+        Set<ComponentName> existingProviders = new HashSet<>();
+        for (int widgetId : widgetIds) {
+            AppWidgetProviderInfo info = mAppWidgetManager.getAppWidgetInfo(widgetId);
+            existingProviders.add(info.provider);
+        }
+
         if (!Preferences.getAddedEcloudWidget(this)) {
             ComponentName provider = DefaultWidgets.INSTANCE.getEcloudWidget();
-            if (allocateAndBindWidget(provider)) {
+            if (existingProviders.contains(provider) || allocateAndBindWidget(provider)) {
                 Preferences.setAddedEcloudWidget(this);
             }
         }
 
         if (!Preferences.getAddedPrivacyWidget(this)) {
             ComponentName provider = DefaultWidgets.INSTANCE.getPrivacyWidget();
-            if (allocateAndBindWidget(provider)) {
+            if (existingProviders.contains(provider) || allocateAndBindWidget(provider)) {
                 Preferences.setAddedPrivacyWidget(this);
             }
         }
 
         if (!Preferences.getAddedWeatherWidget(this)) {
-            if (allocateAndBindWidget(WeatherAppWidgetProvider.COMPONENT_NAME)) {
+            ComponentName provider = DefaultWidgets.INSTANCE.getWeatherWidget();
+            if (existingProviders.contains(provider) || allocateAndBindWidget(provider)) {
                 Preferences.setAddedWeatherWidget(this);
             }
         }

app/src/main/java/foundation/e/blisslauncher/features/weather/WeatherAppWidgetProvider.java

@@ -3,10 +3,13 @@ package foundation.e.blisslauncher.features.weather;
 import android.appwidget.AppWidgetProvider;
 import android.content.ComponentName;
 
+import androidx.annotation.NonNull;
+
 import foundation.e.blisslauncher.BuildConfig;
 
 public class WeatherAppWidgetProvider extends AppWidgetProvider {
 
+    @NonNull
     public static final ComponentName COMPONENT_NAME = new ComponentName(
             BuildConfig.APPLICATION_ID, WeatherAppWidgetProvider.class.getName());
 }

app/src/main/java/foundation/e/blisslauncher/features/widgets/DefaultWidgets.kt

 package foundation.e.blisslauncher.features.widgets
 
 import android.content.ComponentName
+import foundation.e.blisslauncher.features.weather.WeatherAppWidgetProvider
 
 object DefaultWidgets {
     val ecloudWidget = ComponentName("foundation.e.drive", "foundation.e.drive.widgets.EDriveWidget")
     val privacyWidget = ComponentName("foundation.e.advancedprivacy", "foundation.e.privacycentralapp.Widget")
+    val weatherWidget = WeatherAppWidgetProvider.COMPONENT_NAME
 
     val widgets = setOf(ecloudWidget, privacyWidget)
 }