From a42dae9e3bd6e4f99a8b7960578d922fdbb7d529 Mon Sep 17 00:00:00 2001 From: Clark Scheff Date: Tue, 23 Sep 2014 09:25:24 -0700 Subject: Themes: Let ThemeService handle all theme processing [3/3] Change-Id: Ied877eb5f1e96774d2e415970034d0b892765134 --- .../cyanogenmod/themes/provider/AppReceiver.java | 60 ++++++++++++++++---- .../themes/provider/PreferenceUtils.java | 66 ++++++++++++++++++++++ 2 files changed, 114 insertions(+), 12 deletions(-) create mode 100644 src/org/cyanogenmod/themes/provider/PreferenceUtils.java (limited to 'src') diff --git a/src/org/cyanogenmod/themes/provider/AppReceiver.java b/src/org/cyanogenmod/themes/provider/AppReceiver.java index cf0d1c3..c856abd 100644 --- a/src/org/cyanogenmod/themes/provider/AppReceiver.java +++ b/src/org/cyanogenmod/themes/provider/AppReceiver.java @@ -18,32 +18,63 @@ package org.cyanogenmod.themes.provider; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.res.ThemeManager; import android.database.Cursor; import android.net.Uri; import android.provider.ThemesContract; import android.util.Log; +import java.util.Set; + public class AppReceiver extends BroadcastReceiver { public final static String TAG = AppReceiver.class.getName(); @Override public void onReceive(Context context, Intent intent) { - Uri uri = intent.getData(); - String pkgName = uri != null ? uri.getSchemeSpecificPart() : null; - boolean isReplacing = intent.getExtras().getBoolean(Intent.EXTRA_REPLACING, false); - + final Uri uri = intent.getData(); + final String pkgName = uri != null ? uri.getSchemeSpecificPart() : null; + final boolean isReplacing = intent.getExtras().getBoolean(Intent.EXTRA_REPLACING, false); + final String action = intent.getAction(); try { - if (intent.getAction().equals(Intent.ACTION_PACKAGE_ADDED) && !isReplacing) { - ThemePackageHelper.insertPackage(context, pkgName); - } else if (intent.getAction().equals(Intent.ACTION_PACKAGE_FULLY_REMOVED)) { + if (Intent.ACTION_PACKAGE_ADDED.equals(action) && !isReplacing) { + if (!isThemeBeingProcessed(context, pkgName)) { + ThemePackageHelper.insertPackage(context, pkgName); + } else { + // store this package name so we know it's being processed and it can be + // added to the DB when ACTION_THEME_RESOURCES_CACHED is received + PreferenceUtils.addThemeBeingProcessed(context, pkgName); + } + } else if (Intent.ACTION_PACKAGE_FULLY_REMOVED.equals(action)) { ThemePackageHelper.removePackage(context, pkgName); - } else if (intent.getAction().equals(Intent.ACTION_PACKAGE_REPLACED)) { - if (themeExistsInProvider(context, pkgName)) { - ThemePackageHelper.updatePackage(context, pkgName); + } else if (Intent.ACTION_PACKAGE_REPLACED.equals(action)) { + if (!isThemeBeingProcessed(context, pkgName)) { + if (themeExistsInProvider(context, pkgName)) { + ThemePackageHelper.updatePackage(context, pkgName); + } else { + // Edge case where app was not a theme in previous install + ThemePackageHelper.insertPackage(context, pkgName); + } } else { - // Edge case where app was not a theme in previous install - ThemePackageHelper.insertPackage(context, pkgName); + // store this package name so we know it's being processed and it can be + // added to the DB when ACTION_THEME_RESOURCES_CACHED is received + PreferenceUtils.addThemeBeingProcessed(context, pkgName); + } + } else if (Intent.ACTION_THEME_RESOURCES_CACHED.equals(action)) { + final String themePkgName = intent.getStringExtra(Intent.EXTRA_THEME_PACKAGE_NAME); + final int result = intent.getIntExtra(Intent.EXTRA_THEME_RESULT, + PackageManager.INSTALL_FAILED_THEME_UNKNOWN_ERROR); + Set processingThemes = + PreferenceUtils.getInstalledThemesBeingProcessed(context); + if (processingThemes != null && + processingThemes.contains(themePkgName) && result >= 0) { + if (themeExistsInProvider(context, themePkgName)) { + ThemePackageHelper.updatePackage(context, themePkgName); + } else { + // Edge case where app was not a theme in previous install + ThemePackageHelper.insertPackage(context, themePkgName); + } } } } catch(NameNotFoundException e) { @@ -65,4 +96,9 @@ public class AppReceiver extends BroadcastReceiver { } return exists; } + + private boolean isThemeBeingProcessed(Context context, String pkgName) { + ThemeManager tm = (ThemeManager) context.getSystemService(Context.THEME_SERVICE); + return tm.isThemeBeingProcessed(pkgName); + } } diff --git a/src/org/cyanogenmod/themes/provider/PreferenceUtils.java b/src/org/cyanogenmod/themes/provider/PreferenceUtils.java new file mode 100644 index 0000000..09d62bb --- /dev/null +++ b/src/org/cyanogenmod/themes/provider/PreferenceUtils.java @@ -0,0 +1,66 @@ +/* + * Copyright (C) 2014 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.cyanogenmod.themes.provider; + +import android.content.Context; +import android.content.SharedPreferences; + +import java.util.HashSet; +import java.util.Set; + +public class PreferenceUtils { + public static final String PREF_INSTALLED_THEMES_PROCESSING = "installed_themes_processing"; + + public static SharedPreferences getSharedPreferences(Context context) { + if (context == null) return null; + return context.getSharedPreferences(context.getPackageName(), Context.MODE_PRIVATE); + } + + public static Set getInstalledThemesBeingProcessed(Context context) { + SharedPreferences prefs = getSharedPreferences(context); + if (prefs == null) return null; + + return prefs.getStringSet(PREF_INSTALLED_THEMES_PROCESSING, null); + } + + public static void addThemeBeingProcessed(Context context, String pkgName) { + SharedPreferences prefs = getSharedPreferences(context); + if (prefs != null) { + Set updatedThemes = new HashSet(); + Set current = prefs.getStringSet(PREF_INSTALLED_THEMES_PROCESSING, null); + if (current != null) { + updatedThemes.addAll(current); + } + if (updatedThemes.add(pkgName)) { + prefs.edit().putStringSet(PREF_INSTALLED_THEMES_PROCESSING, updatedThemes).apply(); + } + } + } + + public static void removeThemeBeingProcessed(Context context, String pkgName) { + SharedPreferences prefs = getSharedPreferences(context); + if (prefs != null) { + Set updatedThemes = new HashSet(); + Set current = prefs.getStringSet(PREF_INSTALLED_THEMES_PROCESSING, null); + if (current != null) { + updatedThemes.addAll(current); + } + if (updatedThemes.remove(pkgName)) { + prefs.edit().putStringSet(PREF_INSTALLED_THEMES_PROCESSING, updatedThemes).apply(); + } + } + } +} -- cgit v1.2.3