Skip to content

Commit

Permalink
feat: Remove deprecated code
Browse files Browse the repository at this point in the history 
BREAKING CHANGE: This removes code that has been deprecated since Version 2.0.0 (29 December 2019). This has been nearly 3 years since then so we will remove it completely as a result
  • Loading branch information
@itachi1706
itachi1706 committed Mar 14, 2023
1 parent 4bc9054 commit 82eb3e1
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 258 deletions.
24 changes: 0 additions & 24 deletions appupdater/src/main/java/com/itachi1706/appupdater/AppUpdateInitializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,30 +96,6 @@ public void checkForUpdate() {
update(mActivity);
}

/**
* Checks for Update if the app is not sideloaded
*
* @deprecated Use {@link AppUpdateInitializer#checkForUpdate()} instead and the various flag setters to set wifi check
* @param doOnlyOnWifiCheck If the app should only check for update on WIFI
*/
@Deprecated
public void checkForUpdate(boolean doOnlyOnWifiCheck) {
checkForUpdate(doOnlyOnWifiCheck, true);
}

/**
* Checks For Update
* @deprecated Use {@link AppUpdateInitializer#checkForUpdate()} instead and the various flag setters to set wifi and sideload checks
* @param doOnlyOnWifiCheck If the app should only check for update on WIFI
* @param onlyDoCheckForSideloadInstalls If the app should only check for update if the app is sideloaded
*/
@Deprecated
public void checkForUpdate(boolean doOnlyOnWifiCheck, boolean onlyDoCheckForSideloadInstalls) {
this.wifiCheck = doOnlyOnWifiCheck;
this.checkSideload = onlyDoCheckForSideloadInstalls;
checkForUpdate();
}

private void update(Activity mActivity) {
Log.i("Updater", "Checking for new updates...");
new AppUpdateChecker(mActivity, sp, true, mNotificationIcon, baseURL, fullscreen, internalCache).executeOnExecutor();
Expand Down
31 changes: 1 addition & 30 deletions appupdater/src/main/java/com/itachi1706/appupdater/EasterEggResMusicPrefFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* Created by Kenneth on 5/11/2016.
* for com.itachi1706.appupdater in CheesecakeAppUpdater
*
* <p>
* Easter Egg Fragment. Setup initialization methods and call {@link #init()} ()} in your onCreate() or onCreatePreference() method (e.g super.build()) to add the easter egg and relevant stuff
* Initialization methods are done by using {@link SettingsInitializer#explodeInfoSettings(PreferenceFragmentCompat)} after setting the relevant options found in {@link SettingsInitializer}
*/
Expand Down Expand Up @@ -40,35 +40,6 @@ public void init() {
});
}

/**
* @deprecated Use {@link #init()} instead after setting the relevant preference in {@link SettingsInitializer}
*/
@Deprecated
public void addEggMethods() {
addEggMethods(false, null);
}

/**
* @deprecated Use {@link #init()} instead after setting the relevant preference in {@link SettingsInitializer}
*/
@Deprecated
public void addEggMethods(boolean openSource, Preference.OnPreferenceClickListener openSourceListener) {
addEggMethods(openSource, openSourceListener, false, null);
}

/**
* Should be called when implementing the easter egg
* @param openSource true if to enable OSS license view
* @param openSourceListener OSS license view listener
* @param aboutApp true if to enable about app view
* @param aboutAppListener About App View Listener
* @deprecated Use {@link #init()} instead after setting the relevant preference in {@link SettingsInitializer}
*/
@Deprecated
public void addEggMethods(boolean openSource, Preference.OnPreferenceClickListener openSourceListener, boolean aboutApp, Preference.OnPreferenceClickListener aboutAppListener) {
new SettingsInitializer().setAboutApp(aboutApp, aboutAppListener).setOpenSourceLicenseInfo(openSource, openSourceListener).explodeInfoSettings(this);
}

/**
* Eggs are always nice :wink:
*/
Expand Down
227 changes: 23 additions & 204 deletions appupdater/src/main/java/com/itachi1706/appupdater/SettingsInitializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.preference.PreferenceFragment;
import android.util.Log;
import android.util.TypedValue;

Expand All @@ -27,71 +26,39 @@
import com.itachi1706.helperlib.helpers.ValidationHelper;
import com.itachi1706.helperlib.utils.NotifyUserUtil;

import java.security.InvalidParameterException;

/**
* Created by Kenneth on 28/8/2016.
* for com.itachi1706.appupdater in CheesecakeUtilities
*/
@SuppressWarnings("unused")
public final class SettingsInitializer {

@Deprecated private Activity context;
@Deprecated private int notificationIcon;
private boolean fullscreen = false, oss = false, aboutapp = false, issuetracking = false, bugreport = false, fdroid = false;
@Deprecated private android.preference.Preference.OnPreferenceClickListener ossListenerDeprecated = null;
private Preference.OnPreferenceClickListener ossListener = null, aboutAppListener = null;
private String issueTrackingURL = null, bugReportURL = null, fdroidURL = null;
@Deprecated private String serverUrl, legacyLink, updateLink;
private boolean fullscreen = false;
private boolean oss = false;
private boolean aboutapp = false;
private boolean issuetracking = false;
private boolean bugreport = false;
private boolean fdroid = false;
private Preference.OnPreferenceClickListener ossListener = null;
private Preference.OnPreferenceClickListener aboutAppListener = null;
private String issueTrackingURL = null;
private String bugReportURL = null;
private String fdroidURL = null;
private boolean internalCache = false;
private boolean showOnlyForSideload = true, showInstallLocation = true;

private static final String FDROID_REPO = "fdroid", ISSUE_TRACKING = "issuetracker", ABOUT_APP = "aboutapp", VIEW_OSS = "view_oss", BUG_REPORT = "bugreport", CATEGORY_INFO = "info_category";
private boolean showOnlyForSideload = true;
private boolean showInstallLocation = true;

/**
* Initializes new Settings Initializer
*/
public SettingsInitializer() {}

/**
* Initializes new Settings Initializer
* @param activity Activity object that calls this
* @param launcher_icon Resource Id to an icon to show for any notifications
* @param serverUrl Base Server URL
* @param legacyLink URL To full list of app downloads
* @param updateLink URL to latest app download
* @deprecated Use the relevant flag setting methods and {@link SettingsInitializer#explodeUpdaterSettings(Activity, int, String, String, String, PreferenceFragment)}
* in {@link SettingsInitializer} and the new {@link SettingsInitializer#SettingsInitializer()} constructor instead
*/
@Deprecated
public SettingsInitializer(Activity activity, int launcher_icon, String serverUrl, String legacyLink, String updateLink) {
this.context = activity;
this.notificationIcon = launcher_icon;
this.serverUrl = serverUrl;
this.legacyLink = legacyLink;
this.updateLink = updateLink;
}
private static final String FDROID_REPO = "fdroid";
private static final String ISSUE_TRACKING = "issuetracker";
private static final String ABOUT_APP = "aboutapp";
private static final String VIEW_OSS = "view_oss";
private static final String BUG_REPORT = "bugreport";
private static final String CATEGORY_INFO = "info_category";

/**
* Initializes new Settings Initializer
* @param activity Activity object that calls this
* @param launcher_icon Resource Id to an icon to show for any notifications
* @param serverUrl Base Server URL
* @param legacyLink URL To full list of app downloads
* @param updateLink URL to latest app download
* @param fullscreen Use Full Screen Update Activity
* @deprecated Use the relevant flag setting methods and {@link SettingsInitializer#explodeUpdaterSettings(Activity, int, String, String, String, PreferenceFragment)}
* in {@link SettingsInitializer} and the new {@link SettingsInitializer#SettingsInitializer()} constructor instead
*/
@Deprecated
public SettingsInitializer(Activity activity, int launcher_icon, String serverUrl, String legacyLink, String updateLink, boolean fullscreen) {
this.context = activity;
this.notificationIcon = launcher_icon;
this.serverUrl = serverUrl;
this.legacyLink = legacyLink;
this.updateLink = updateLink;
this.fullscreen = fullscreen;
}
public SettingsInitializer() { /* Empty Constructor */ }

/**
* Sets if we should use the fullscreen version of the updater
Expand Down Expand Up @@ -120,7 +87,7 @@ public SettingsInitializer showOnlyForSideload(boolean showOnlyForSideload) {
* @return This object instance for chaining
*/
public SettingsInitializer showInstallLocation(boolean showInstallLocation) {
this.fullscreen = showInstallLocation;
this.showInstallLocation = showInstallLocation;
return this;
}

Expand All @@ -137,20 +104,6 @@ public SettingsInitializer setInternalCache(boolean internalCache) {
return this;
}

/**
* To enable the Open Source License Preference where on user click, you could use to show the licenses in your app
* @param enabled Whether to show the preference or not
* @param listener Action to do when user clicks on the app (null for no action)
* @return The instance itself
* @deprecated Use {{@link #setOpenSourceLicenseInfo(boolean, Preference.OnPreferenceClickListener)} instead
*/
@Deprecated
public SettingsInitializer setOpenSourceLicenseInfo(boolean enabled, android.preference.Preference.OnPreferenceClickListener listener) {
this.oss = enabled;
this.ossListenerDeprecated = listener;
return this;
}

/**
* To enable the Open Source License Preference where on user click, you could use to show the licenses in your app
* @param enabled Whether to show the preference or not
Expand Down Expand Up @@ -211,141 +164,6 @@ public SettingsInitializer setFDroidRepo(boolean enabled, @Nullable String repoU
return this;
}

@Deprecated
private boolean hasAllNeededForUpdate() {
return !(this.updateLink == null || this.legacyLink == null || this.serverUrl == null);
}

/**
* Explodes general info settings in your preference fragment
* @param fragment The preference fragment object
* @return The instance itself
* @deprecated Use {@link #explodeInfoSettings(PreferenceFragmentCompat)} instead
*/
@Deprecated
public SettingsInitializer explodeInfoSettings(final PreferenceFragment fragment) {
fragment.addPreferencesFromResource(R.xml.pref_appinfo);

//Debug Info Get
String version = "NULL", packName = "NULL";
int versionCode = 0;
try {
PackageInfo pInfo = fragment.getActivity().getPackageManager().getPackageInfo(fragment.getActivity().getPackageName(), 0);
version = pInfo.versionName;
packName = pInfo.packageName;
versionCode = pInfo.versionCode;
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
}
android.preference.Preference verPref = fragment.findPreference("view_app_version");
verPref.setSummary(version + "-b" + versionCode);
fragment.findPreference("view_app_name").setSummary(packName);
fragment.findPreference("view_sdk_version").setSummary(android.os.Build.VERSION.RELEASE);
fragment.findPreference("vDevInfo").setOnPreferenceClickListener(preference -> {
fragment.startActivity(new Intent(fragment.getActivity(), DebugInfoActivity.class));
return true;
});
fragment.findPreference("vAppLog").setOnPreferenceClickListener(preference -> {
fragment.startActivity(new Intent(fragment.getActivity(), ViewLogsActivity.class));
return true;
});
// Check to enable Open Source License View or not
fragment.findPreference(VIEW_OSS).setOnPreferenceClickListener(ossListenerDeprecated);
if (!this.oss) ((android.preference.PreferenceCategory) fragment.findPreference(CATEGORY_INFO)).removePreference(fragment.findPreference(VIEW_OSS));
((android.preference.PreferenceCategory) fragment.findPreference(CATEGORY_INFO)).removePreference(fragment.findPreference(ABOUT_APP)); // Permenantly remove for this
((android.preference.PreferenceCategory) fragment.findPreference(CATEGORY_INFO)).removePreference(fragment.findPreference(ISSUE_TRACKING)); // Permenantly remove for this
((android.preference.PreferenceCategory) fragment.findPreference(CATEGORY_INFO)).removePreference(fragment.findPreference(BUG_REPORT)); // Permenantly remove for this
((android.preference.PreferenceCategory) fragment.findPreference(CATEGORY_INFO)).removePreference(fragment.findPreference(FDROID_REPO)); // Permenantly remove for this
return this;
}

/**
* Explodes updater settings in your preference fragment
* @param fragment The preference fragment object
* @return The instance itself
* @deprecated Use {@link #explodeUpdaterSettings(Activity, int, String, String, String, PreferenceFragment)} instead}
*/
@Deprecated
public SettingsInitializer explodeSettings(PreferenceFragment fragment) {
return explodeUpdaterSettings(fragment, true, true);
}

/**
* Explodes updater settings in your preference fragment
* @param fragment The preference fragment object
* @return The instance itself
* @deprecated Use {@link #explodeUpdaterSettings(Activity, int, String, String, String, PreferenceFragment)} instead
*/
@Deprecated
public SettingsInitializer explodeUpdaterSettings(PreferenceFragment fragment) {
return explodeUpdaterSettings(fragment, true, true);
}

/**
* Explodes updater settings in your preference fragment
* @param activity The activity object
* @param notificationIcon Notification Icon Resource ID
* @param serverUrl Base Server URL
* @param legacyLink URL To full list of app downloads
* @param updateLink URL to latest app download
* @param fragment The preference fragment object
* @return The instance of this object for chaining
* @deprecated Use {@link #explodeUpdaterSettings(Activity, int, String, String, String, PreferenceFragmentCompat)} instead
*/
@Deprecated
public SettingsInitializer explodeUpdaterSettings(Activity activity, @DrawableRes final int notificationIcon,
final String serverUrl, final String legacyLink, final String updateLink,
PreferenceFragment fragment) {
final Activity context = activity;
if (showOnlyForSideload && !ValidationHelper.checkSideloaded(context) && !showInstallLocation)
return this; // Sideloaded

if (showOnlyForSideload && showInstallLocation && !ValidationHelper.checkSideloaded(context)) {
// Expand minimal
fragment.addPreferencesFromResource(R.xml.pref_updater_min);
String installLocation = getInstallLocation(context);
fragment.findPreference("installer_from").setSummary(installLocation);
return this;
}

final SharedPreferences sp = PrefHelper.getDefaultSharedPreferences(context);
fragment.addPreferencesFromResource(R.xml.pref_updater);
fragment.findPreference("launch_updater").setOnPreferenceClickListener(preference -> {
new AppUpdateChecker(context, sp, notificationIcon, serverUrl, fullscreen, internalCache).executeOnExecutor();
return false;
});

fragment.findPreference("get_old_app").setOnPreferenceClickListener(preference -> launchCustomTabs(context, legacyLink));
fragment.findPreference("get_latest_app").setOnPreferenceClickListener(preference -> launchCustomTabs(context, updateLink));

fragment.findPreference("android_changelog").setOnPreferenceClickListener(preference -> {
UpdaterHelper.settingGenerateChangelog(sp, context);
return true;
});

String installLocation = getInstallLocation(context);
fragment.findPreference("installer_from").setSummary(installLocation);
return this;
}

/**
* Explodes updater settings in your preference fragment
* @param fragment The preference fragment object
* @param showOnlyForSideload Do not show any field if app is not sideloaded
* @param showInstallLocation Only show install location field if app is sideloaded
* @return The instance itself
* @deprecated Use {@link SettingsInitializer#explodeUpdaterSettings(Activity, int, String, String, String, PreferenceFragment)} instead
* Note that {@link #showOnlyForSideload(boolean)} and {@link #showInstallLocation(boolean)} now exists as flag setters
*/
@Deprecated
@SuppressWarnings("WeakerAccess")
public SettingsInitializer explodeUpdaterSettings(PreferenceFragment fragment, boolean showOnlyForSideload, boolean showInstallLocation) {
this.showOnlyForSideload = showOnlyForSideload;
this.showInstallLocation = showInstallLocation;
if (!hasAllNeededForUpdate()) throw new InvalidParameterException("You need to set the appropriate setters for this to work");
return explodeUpdaterSettings(this.context, this.notificationIcon, this.serverUrl, this.legacyLink, this.updateLink, fragment);
}

/**
* Explodes general info settings in your preference fragment
* NOTE: This is automatically exploded if you use a EasterEgg fragment
Expand All @@ -357,7 +175,8 @@ public SettingsInitializer explodeInfoSettings(final PreferenceFragmentCompat fr
fragment.addPreferencesFromResource(R.xml.pref_appinfo);

//Debug Info Get
String version = "NULL", packName = "NULL";
String version = "NULL";
String packName = "NULL";
long versionCode = 0;
try {
PackageInfo pInfo = fragment.getActivity().getPackageManager().getPackageInfo(fragment.getActivity().getPackageName(), 0);
Expand Down

0 comments on commit 82eb3e1

Please sign in to comment.