diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e2a804bf8..e1d2ef0cb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -107,7 +107,7 @@ latestVersion = null; private String downloadedFilePath; - private static final String updateDir = String.format("%s/%s", MAGISK_UPDATE_DIR, MOD_NAME); - private static final String moduleDir = String.format("%s/%s", MAGISK_MODULES_DIR, MOD_NAME); final BroadcastReceiver downloadCompletionReceiver = new BroadcastReceiver() { @@ -87,7 +82,6 @@ public void onReceive(Context context, Intent intent) { boolean successful = false; - Log.d("UpdateFragment", "onReceive: " + intent.getAction()); if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(intent.getAction()) && intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) == downloadID) { try (Cursor downloadData = downloadManager.query( new DownloadManager.Query() @@ -97,7 +91,6 @@ public void onReceive(Context context, Intent intent) { int uriColIndex = downloadData.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI); File downloadedFile = new File(URI.create(downloadData.getString(uriColIndex))); - Log.d("UpdateFragment", "downloadedFile = " + downloadData.getString(uriColIndex)); if (downloadedFile.exists()) { downloadedFilePath = new File(URI.create(downloadData.getString(uriColIndex))).getAbsolutePath(); @@ -157,7 +150,6 @@ public View onCreateView( } private void installApk(String downloadPath) { - Log.d("UpdateFragment", "installApk: " + downloadPath); Intent promptInstall = new Intent(Intent.ACTION_VIEW).setDataAndType( FileProvider.getUriForFile(getContext(), BuildConfig.APPLICATION_ID + ".provider", new File(downloadPath)), "application/vnd.android.package-archive"); @@ -250,7 +242,7 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { { BtnText = R.string.reinstall_word; } - enable = true; //stable version is ALWAYS flashable, so that user can revert from canary or repair installation + enable = true; //stable version is ALWAYS flashable, so that user can revert from beta or repair installation } else { if (latestCode > currentVersionCode || (currentVersionType == 1)) { enable = true; @@ -267,8 +259,6 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { binding.updateChannelRadioGroup.setOnCheckedChangeListener(onCheckChangedListener); - binding.packageTypeRadioGroup.setOnCheckedChangeListener((radioGroup, i) -> onCheckChangedListener.onCheckedChanged(view.findViewById(R.id.updateChannelRadioGroup), 0)); - binding.updateBtn.setOnClickListener(view1 -> { if (rebootPending) { Shell.cmd("reboot"); @@ -284,12 +274,6 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { } }); - if (currentVersionType == 1) { - ((RadioButton) view.findViewById(R.id.fullTypeID)).setChecked(true); - } else { - ((RadioButton) view.findViewById(R.id.XposedTypeID)).setChecked(true); - } - if (currentVersionName.toLowerCase().contains("beta")) { ((RadioButton) view.findViewById(R.id.betaID)).setChecked(true); } else { @@ -323,7 +307,6 @@ public void startDownload(String zipURL, int versionNumber) { //noinspection ConstantConditions if (getContext() != null) { - Log.d("UpdateFragment", "startDownload: " + downloadID); getContext().registerReceiver(downloadCompletionReceiver, filters, RECEIVER_EXPORTED); } } @@ -340,8 +323,6 @@ public void notifyInstall() { return; } - Log.d("UpdateFragment", "notifyInstall: " + downloadedFilePath); - Intent notificationIntent = new Intent(getContext(), MainActivity.class); notificationIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); notificationIntent.setAction(Intent.ACTION_RUN); diff --git a/app/src/main/java/it/dhd/oxygencustomizer/weather/WeatherContentProvider.java b/app/src/main/java/it/dhd/oxygencustomizer/weather/WeatherContentProvider.java index 5ad4d08f4..b79900a0e 100644 --- a/app/src/main/java/it/dhd/oxygencustomizer/weather/WeatherContentProvider.java +++ b/app/src/main/java/it/dhd/oxygencustomizer/weather/WeatherContentProvider.java @@ -92,7 +92,7 @@ public class WeatherContentProvider extends ContentProvider { COLUMN_ICON_PACK }; - public static final String AUTHORITY = "it.dhd.oxygencustomizer.provider"; + public static final String AUTHORITY = "it.dhd.oxygencustomizer.weatherprovider"; private static final UriMatcher sUriMatcher; static { diff --git a/app/src/main/java/it/dhd/oxygencustomizer/weather/WeatherUpdateService.java b/app/src/main/java/it/dhd/oxygencustomizer/weather/WeatherUpdateService.java index 47b84e3cd..5a68bc7b6 100644 --- a/app/src/main/java/it/dhd/oxygencustomizer/weather/WeatherUpdateService.java +++ b/app/src/main/java/it/dhd/oxygencustomizer/weather/WeatherUpdateService.java @@ -267,6 +267,7 @@ private void updateWeather() { if (w != null) { Config.setWeatherData(w, WeatherUpdateService.this); WeatherContentProvider.updateCachedWeatherInfo(WeatherUpdateService.this); + Log.d(TAG, "Weather updated updateCachedWeatherInfo"); //WeatherAppWidgetProvider.updateAllWidgets(WeatherUpdateService.this); // we are outa here break; @@ -287,6 +288,7 @@ private void updateWeather() { } finally { if (w == null) { // error + if (DEBUG) Log.d(TAG, "error updating weather"); Config.setUpdateError(WeatherUpdateService.this, true); } // send broadcast that something has changed diff --git a/app/src/main/java/it/dhd/oxygencustomizer/xposed/utils/OmniJawsClient.java b/app/src/main/java/it/dhd/oxygencustomizer/xposed/utils/OmniJawsClient.java index bd9670310..a0672e54f 100644 --- a/app/src/main/java/it/dhd/oxygencustomizer/xposed/utils/OmniJawsClient.java +++ b/app/src/main/java/it/dhd/oxygencustomizer/xposed/utils/OmniJawsClient.java @@ -51,11 +51,11 @@ public class OmniJawsClient { private static final boolean DEBUG = true; public static final String SERVICE_PACKAGE = BuildConfig.APPLICATION_ID; public static final Uri WEATHER_URI - = Uri.parse("content://it.dhd.oxygencustomizer.provider/weather"); + = Uri.parse("content://it.dhd.oxygencustomizer.weatherprovider/weather"); public static final Uri SETTINGS_URI - = Uri.parse("content://it.dhd.oxygencustomizer.provider/settings"); + = Uri.parse("content://it.dhd.oxygencustomizer.weatherprovider/settings"); public static final Uri CONTROL_URI - = Uri.parse("content://it.dhd.oxygencustomizer.provider/control"); + = Uri.parse("content://it.dhd.oxygencustomizer.weatherprovider/control"); private static final String ICON_PACKAGE_DEFAULT = BuildConfig.APPLICATION_ID; private static final String ICON_PREFIX_DEFAULT = "google"; diff --git a/app/src/main/res/layout/update_fragment.xml b/app/src/main/res/layout/update_fragment.xml index 223e21916..0127ed643 100644 --- a/app/src/main/res/layout/update_fragment.xml +++ b/app/src/main/res/layout/update_fragment.xml @@ -75,43 +75,6 @@ PixelXper https://github.com/siavash79/PixelXpert/blob/stable/app/src/main/res/l android:textColor="?attr/colorOnSurface" /> - - - - - - - - + app:layout_constraintTop_toBottomOf="@+id/updateChannelRadioGroup" />