diff --git a/CyDelete8.plist b/CyDelete.plist similarity index 100% rename from CyDelete8.plist rename to CyDelete.plist diff --git a/CyDelete8.xm b/CyDelete.xm similarity index 99% rename from CyDelete8.xm rename to CyDelete.xm index fb1bef5..861b5f4 100644 --- a/CyDelete8.xm +++ b/CyDelete.xm @@ -1,6 +1,6 @@ // -// CyDelete7.xm -// CyDelete7 +// CyDelete8.xm +// CyDelete8 // // Created by Ryan Burke on 02.01.2014. // Copyright (c) 2014 Ryan Burke. All rights reserved. @@ -48,18 +48,18 @@ static NSOperationQueue *uninstallQueue; //Loads the application translation bundle and stores it locally. static void initTranslation() { - cyDelBundle = [NSBundle bundleWithPath:@"/Library/Application Support/CyDelete8/CyDelete8.bundle"]; + cyDelBundle = [NSBundle bundleWithPath:@"/Library/Application Support/CyDelete/CyDelete.bundle"]; } static bool getCFBool(CFStringRef key, bool defaultValue) { //Sync the latest version of the preferences. - bool synced = CFPreferencesAppSynchronize(CFSTR("com.ryanburke.cydelete8")); + bool synced = CFPreferencesAppSynchronize(CFSTR("com.ryanburke.cydelete")); //If the sync failed, lets just default to protecting Cydia for safety. if(!synced) return defaultValue; //Create a boolean object to hold the success value from next function. Boolean success; //Get the value of the key from the preferences. - bool result = CFPreferencesGetAppBooleanValue(key, CFSTR("com.ryanburke.cydelete8"), &success); + bool result = CFPreferencesGetAppBooleanValue(key, CFSTR("com.ryanburke.cydelete"), &success); //If the enabled key existed and we got the value okay. if(success) { //Return the value of the key. diff --git a/Cydelete8/Cydelete8ListController.mm b/CyDelete/CyDeleteListController.mm similarity index 86% rename from Cydelete8/Cydelete8ListController.mm rename to CyDelete/CyDeleteListController.mm index 352af6d..1f1d775 100644 --- a/Cydelete8/Cydelete8ListController.mm +++ b/CyDelete/CyDeleteListController.mm @@ -1,6 +1,5 @@ // -// cydelete7settings.m -// cydelete7settings +// CyDeleteListController.mm // // Created by Ryan Burke on 03.01.2014. // Copyright (c) 2014 Ryan Burke. All rights reserved. @@ -9,7 +8,7 @@ #include #include -@interface Cydelete8ListController : PSListController +@interface CyDeleteListController : PSListController - (id)specifiers; - (void)ryanDonate:(id)arg; @@ -17,11 +16,11 @@ - (void)viewSource:(id)arg; @end -@implementation Cydelete8ListController +@implementation CyDeleteListController - (id)specifiers { if (_specifiers == nil) { - _specifiers = [[self loadSpecifiersFromPlistName:@"Cydelete8" target:self] retain]; + _specifiers = [[self loadSpecifiersFromPlistName:@"CyDelete" target:self] retain]; [self localizedSpecifiersWithSpecifiers:_specifiers]; } return _specifiers; @@ -60,7 +59,7 @@ - (void)ryanDonate:(id)arg { } - (void)viewSource:(id)arg { - [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://github.com/ryanb93/CyDelete7"]]; + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://github.com/ryanb93/CyDelete"]]; } diff --git a/Cydelete8/Makefile b/CyDelete/Makefile similarity index 53% rename from Cydelete8/Makefile rename to CyDelete/Makefile index c2f2388..38db991 100644 --- a/Cydelete8/Makefile +++ b/CyDelete/Makefile @@ -4,14 +4,14 @@ TARGET = iphone:8.1 include theos/makefiles/common.mk -BUNDLE_NAME = Cydelete8 -Cydelete8_FILES = Cydelete8ListController.mm -Cydelete8_INSTALL_PATH = /Library/PreferenceBundles -Cydelete8_FRAMEWORKS = Foundation UIKit -Cydelete8_PRIVATE_FRAMEWORKS = Preferences +BUNDLE_NAME = CyDelete +CyDelete_FILES = CyDeleteListController.mm +CyDelete_INSTALL_PATH = /Library/PreferenceBundles +CyDelete_FRAMEWORKS = Foundation UIKit +CyDelete_PRIVATE_FRAMEWORKS = Preferences include $(THEOS_MAKE_PATH)/bundle.mk internal-stage:: $(ECHO_NOTHING)mkdir -p $(THEOS_STAGING_DIR)/Library/PreferenceLoader/Preferences$(ECHO_END) - $(ECHO_NOTHING)cp entry.plist $(THEOS_STAGING_DIR)/Library/PreferenceLoader/Preferences/Cydelete8.plist$(ECHO_END) + $(ECHO_NOTHING)cp entry.plist $(THEOS_STAGING_DIR)/Library/PreferenceLoader/Preferences/CyDelete.plist$(ECHO_END) diff --git a/Cydelete8/Resources/Cydelete8.plist b/CyDelete/Resources/CyDelete.plist similarity index 94% rename from Cydelete8/Resources/Cydelete8.plist rename to CyDelete/Resources/CyDelete.plist index 5baa398..a9001e8 100644 --- a/Cydelete8/Resources/Cydelete8.plist +++ b/CyDelete/Resources/CyDelete.plist @@ -16,7 +16,7 @@ default defaults - com.ryanburke.cydelete8 + com.ryanburke.cydelete key enabled label @@ -38,7 +38,7 @@ default defaults - com.ryanburke.cydelete8 + com.ryanburke.cydelete key CDProtectCydia label @@ -52,7 +52,7 @@ default defaults - com.ryanburke.cydelete8 + com.ryanburke.cydelete key CDProtectPangu label diff --git a/Cydelete8/Resources/CyDelete.png b/CyDelete/Resources/CyDelete.png similarity index 100% rename from Cydelete8/Resources/CyDelete.png rename to CyDelete/Resources/CyDelete.png diff --git a/Cydelete8/Resources/CyDelete@2x.png b/CyDelete/Resources/CyDelete@2x.png similarity index 100% rename from Cydelete8/Resources/CyDelete@2x.png rename to CyDelete/Resources/CyDelete@2x.png diff --git a/Cydelete8/Resources/Cydia.png b/CyDelete/Resources/Cydia.png similarity index 100% rename from Cydelete8/Resources/Cydia.png rename to CyDelete/Resources/Cydia.png diff --git a/Cydelete8/Resources/Info.plist b/CyDelete/Resources/Info.plist similarity index 84% rename from Cydelete8/Resources/Info.plist rename to CyDelete/Resources/Info.plist index 83f52a8..9f67ca3 100644 --- a/Cydelete8/Resources/Info.plist +++ b/CyDelete/Resources/Info.plist @@ -5,9 +5,9 @@ CFBundleDevelopmentRegion English CFBundleExecutable - Cydelete8 + CyDelete CFBundleIdentifier - com.ryanburke.cydelete8 + com.ryanburke.cydelete CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -21,8 +21,8 @@ DTPlatformName iphoneos MinimumOSVersion - 8.0 + 7.0 NSPrincipalClass - Cydelete8ListController + CyDeleteListController diff --git a/Cydelete8/Resources/Pangu.png b/CyDelete/Resources/Pangu.png similarity index 100% rename from Cydelete8/Resources/Pangu.png rename to CyDelete/Resources/Pangu.png diff --git a/Cydelete8/Resources/da.lproj/Localizable.strings b/CyDelete/Resources/da.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/da.lproj/Localizable.strings rename to CyDelete/Resources/da.lproj/Localizable.strings diff --git a/Cydelete8/Resources/de.lproj/Localizable.strings b/CyDelete/Resources/de.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/de.lproj/Localizable.strings rename to CyDelete/Resources/de.lproj/Localizable.strings diff --git a/Cydelete8/Resources/en.lproj/Localizable.strings b/CyDelete/Resources/en.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/en.lproj/Localizable.strings rename to CyDelete/Resources/en.lproj/Localizable.strings diff --git a/Cydelete8/Resources/es.lproj/Localizable.strings b/CyDelete/Resources/es.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/es.lproj/Localizable.strings rename to CyDelete/Resources/es.lproj/Localizable.strings diff --git a/Cydelete8/Resources/fr.lproj/Localizable.strings b/CyDelete/Resources/fr.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/fr.lproj/Localizable.strings rename to CyDelete/Resources/fr.lproj/Localizable.strings diff --git a/Cydelete8/Resources/he.lproj/Localizable.strings b/CyDelete/Resources/he.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/he.lproj/Localizable.strings rename to CyDelete/Resources/he.lproj/Localizable.strings diff --git a/Cydelete8/Resources/hu.lproj/Localizable.strings b/CyDelete/Resources/hu.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/hu.lproj/Localizable.strings rename to CyDelete/Resources/hu.lproj/Localizable.strings diff --git a/Cydelete8/Resources/it.lproj/Localizable.strings b/CyDelete/Resources/it.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/it.lproj/Localizable.strings rename to CyDelete/Resources/it.lproj/Localizable.strings diff --git a/Cydelete8/Resources/nl.lproj/Localizable.strings b/CyDelete/Resources/nl.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/nl.lproj/Localizable.strings rename to CyDelete/Resources/nl.lproj/Localizable.strings diff --git a/Cydelete8/Resources/ru.lproj/Localizable.strings b/CyDelete/Resources/ru.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/ru.lproj/Localizable.strings rename to CyDelete/Resources/ru.lproj/Localizable.strings diff --git a/Cydelete8/Resources/tr.lproj/Localizable.strings b/CyDelete/Resources/tr.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/tr.lproj/Localizable.strings rename to CyDelete/Resources/tr.lproj/Localizable.strings diff --git a/Cydelete8/Resources/zh_CN.lproj/Localizable.strings b/CyDelete/Resources/zh_CN.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/zh_CN.lproj/Localizable.strings rename to CyDelete/Resources/zh_CN.lproj/Localizable.strings diff --git a/Cydelete8/Resources/zh_TW.lproj/Localizable.strings b/CyDelete/Resources/zh_TW.lproj/Localizable.strings similarity index 100% rename from Cydelete8/Resources/zh_TW.lproj/Localizable.strings rename to CyDelete/Resources/zh_TW.lproj/Localizable.strings diff --git a/Cydelete8/entry.plist b/CyDelete/entry.plist similarity index 50% rename from Cydelete8/entry.plist rename to CyDelete/entry.plist index 09cc039..b36dad9 100644 --- a/Cydelete8/entry.plist +++ b/CyDelete/entry.plist @@ -1,10 +1,10 @@ { entry = { - bundle = Cydelete8; + bundle = CyDelete; cell = PSLinkCell; - detail = "Cydelete8ListController"; + detail = "CyDeleteListController"; icon = "CyDelete.png"; isController = 1; - label = CyDelete8; + label = CyDelete; }; } \ No newline at end of file diff --git a/Cydelete8/theos b/CyDelete/theos similarity index 100% rename from Cydelete8/theos rename to CyDelete/theos diff --git a/Makefile b/Makefile index 8364b92..d7e3a3b 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,12 @@ TARGET = iphone:8.1 include theos/makefiles/common.mk -TWEAK_NAME = CyDelete8 -CyDelete8_FILES = CyDelete8.xm -CyDelete8_FRAMEWORKS = Foundation, UIKit +TWEAK_NAME = CyDelete +CyDelete_FILES = CyDelete.xm +CyDelete_FRAMEWORKS = Foundation, UIKit include $(THEOS_MAKE_PATH)/tweak.mk -SUBPROJECTS += setuid CyDelete8 +SUBPROJECTS += setuid CyDelete include $(THEOS_MAKE_PATH)/aggregate.mk after-install:: diff --git a/README.md b/README.md index 24c49f5..fc49847 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -CyDelete8 +CyDelete ========= -The original mobile substrate CyDelete tweak created by @DHowett updated for iOS 8. +The original mobile substrate CyDelete tweak created by @DHowett updated for iOS 7 and 8. diff --git a/layout/DEBIAN/control b/layout/DEBIAN/control index 594c0e2..69c2683 100755 --- a/layout/DEBIAN/control +++ b/layout/DEBIAN/control @@ -1,4 +1,4 @@ -Package: com.ryanburke.cydelete8 +Package: com.ryanburke.cydelete Name: CyDelete8 Depends: firmware (>=7.0), mobilesubstrate, preferenceloader, apt, bash Version: 1.0 diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/Info.plist b/layout/Library/Application Support/CyDelete/CyDelete.bundle/Info.plist similarity index 87% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/Info.plist rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/Info.plist index a0ffb9e..93c1e42 100755 --- a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/Info.plist +++ b/layout/Library/Application Support/CyDelete/CyDelete.bundle/Info.plist @@ -5,9 +5,9 @@ CFBundleDevelopmentRegion English CFBundleExecutable - CyDelete8.dylib + CyDelete.dylib CFBundleIdentifier - com.ryanburke.cydelete8 + com.ryanburke.cydelete CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -21,6 +21,6 @@ DTPlatformName iphoneos MinimumOSVersion - 8.0 + 7.0 diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/da.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/da.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/da.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/da.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/de.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/de.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/de.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/de.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/en.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/en.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/en.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/en.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/es.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/es.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/es.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/es.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/fr.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/fr.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/fr.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/fr.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/he.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/he.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/he.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/he.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/hu.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/hu.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/hu.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/hu.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/it.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/it.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/it.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/it.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/nl.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/nl.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/nl.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/nl.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/ru.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/ru.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/ru.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/ru.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/tr.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/tr.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/tr.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/tr.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/zh_CN.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/zh_CN.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/zh_CN.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/zh_CN.lproj/Localizable.strings diff --git a/layout/Library/Application Support/CyDelete8/CyDelete8.bundle/zh_TW.lproj/Localizable.strings b/layout/Library/Application Support/CyDelete/CyDelete.bundle/zh_TW.lproj/Localizable.strings similarity index 100% rename from layout/Library/Application Support/CyDelete8/CyDelete8.bundle/zh_TW.lproj/Localizable.strings rename to layout/Library/Application Support/CyDelete/CyDelete.bundle/zh_TW.lproj/Localizable.strings