[global] make providers always enabled without plus; add Breaks:

hbang · Feb 24, 2018 · 077e2d2 · 077e2d2
1 parent b3fa0bc
commit 077e2d2
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 25 deletions.
diff --git a/api/HBTSProvider.x b/api/HBTSProvider.x
@@ -14,15 +14,8 @@
 #pragma mark - State
 
 - (BOOL)isEnabled {
-	HBTSPreferences *preferences = [%c(HBTSPreferences) sharedInstance];
-
-	if (self.preferencesBundle) {
-		// the provider manages its own preferences. return YES
-		return YES;
-	} else {
-		// ask the preferences if we're enabled
-		return [preferences isProviderEnabled:self.appIdentifier];
-	}
+	// the toggles to enable/disable a handler is handled by TypeStatus Plus, so always use YES here
+	return YES;
 }
 
 #pragma mark - Messaging methods

diff --git a/control b/control
@@ -4,6 +4,7 @@ Depends: firmware (>= 7.0), firmware (<< 11.3), mobilesubstrate, preferenceloade
 Recommends: firmware (>= 9.0) | libstatusbar (>= 1:0.9.9.0-1), firmware (<< 9.1) | org.thebigboss.libstatus9 (>= 1:0.0.1.5-0)
 Conflicts: ws.hbang.typestatus
 Replaces: ws.hbang.typestatus
+Breaks: ws.hbang.typestatusplus (<< 1.5)
 Version: 2.4
 Architecture: iphoneos-arm
 Description: iMessage typing/read indicators in status bar

diff --git a/global/HBTSPreferences.h b/global/HBTSPreferences.h
@@ -16,6 +16,4 @@
 
 @property (nonatomic, readonly) BOOL messagesEnabled, messagesGlobalSendTyping;
 
-- (BOOL)isProviderEnabled:(NSString *)appIdentifier;
-
 @end
diff --git a/global/HBTSPreferences.m b/global/HBTSPreferences.m
@@ -48,10 +48,6 @@ - (instancetype)init {
 	return self;
 }
 
-- (BOOL)isProviderEnabled:(NSString *)appIdentifier {
-	return [_preferences boolForKey:[NSString stringWithFormat:@"ProviderEnabled-%@", appIdentifier] default:YES];
-}
-
 - (void)_migrateIfNeeded {
 	// upgrade old, ugly, boolean preferences to cleaner enums
 

diff --git a/springboard/SpringBoard.x b/springboard/SpringBoard.x
@@ -41,13 +41,3 @@ void ReceivedRelayedNotification(CFMachPortRef port, LMMessage *request, CFIndex
 		HBLogError(@"failed to start service! result = %i", result);
 	}
 }
-
-#import "../api/HBTSNotification+Private.h"
-#import "../api/HBTSStatusBarAlertServer.h"
-%ctor {
-	[NSTimer scheduledTimerWithTimeInterval:8 repeats:YES block:^(NSTimer *timer) {
-		HBTSNotification*a=[[HBTSNotification alloc] initWithType:0 sender:@"kirb" iconName:@"TypeStatus"];
-		a.sourceBundleID=@"com.apple.MobileSMS";
-		[HBTSStatusBarAlertServer sendNotification:a];
-	}];
-}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,6 +16,4 @@

		@property (nonatomic, readonly) BOOL messagesEnabled, messagesGlobalSendTyping;

		- (BOOL)isProviderEnabled:(NSString *)appIdentifier;

		@end