fix arc and time wrap issue, version bump to 0.0.2

Author: eclair4151

Makefile

@@ -5,6 +5,7 @@ TWEAK_NAME = NotiBlock
 NotiBlock_FILES = Tweak.xm notiblockpref/NBPNotificationFilter.m notiblockpref/NBPAppInfo.m
 NotiBlock_LIBRARIES = applist
 NotiBlock_EXTRA_FRAMEWORKS += Cephei
+NotiBlock_CFLAGS = -fobjc-arc
 
 include $(THEOS_MAKE_PATH)/tweak.mk
 

Tweak.xm

@@ -27,7 +27,6 @@
 
 @interface NCNotificationShortLookViewController: NCNotificationViewController
 -(id)_initWithNotificationRequest:(id)arg1 revealingAdditionalContentOnPresentation:(BOOL)arg2 ;
--(id)_scrollView;
 @end
 
 @interface NCNotificationRequest
@@ -93,13 +92,13 @@ returns whether we are currently inbetween the start time and and time and on a
 
 	if ([[newStartTime earlierDate:newEndTime] isEqualToDate:newEndTime]) { //backwards (start time before end time)
 		HBLogDebug(@"NOTIBLOCK - backwards schedule mode");
-		return [[newEndTime earlierDate:curTime] isEqualToDate:newEndTime] || [[newStartTime earlierDate:curTime] isEqualToDate:curTime];
+		return [[newStartTime earlierDate:curTime] isEqualToDate:newStartTime] || [[newEndTime earlierDate:curTime] isEqualToDate:curTime];
 	} else { //regular, check for in between
 
 		HBLogDebug(@"NOTIBLOCK - regular schedule mode");
-		HBLogDebug(@"NOTIBLOCK - is after start - curTime: %f", [curTime timeIntervalSince1970]);	
-		HBLogDebug(@"NOTIBLOCK - is after start - newStartTime: %f", [newStartTime timeIntervalSince1970]);	
-		HBLogDebug(@"NOTIBLOCK - is after start - newEndTime: %f", [newEndTime timeIntervalSince1970]);	
+		HBLogDebug(@"NOTIBLOCK - curTime: %f", [curTime timeIntervalSince1970]);	
+		HBLogDebug(@"NOTIBLOCK - newStartTime: %f", [newStartTime timeIntervalSince1970]);	
+		HBLogDebug(@"NOTIBLOCK - newEndTime: %f", [newEndTime timeIntervalSince1970]);	
 
 		HBLogDebug(@"NOTIBLOCK - is after start - %@",([[newStartTime earlierDate:curTime] isEqualToDate:newStartTime] ? @"true" : @"false"));
 		HBLogDebug(@"NOTIBLOCK - is before end - %@",([[newEndTime earlierDate:curTime] isEqualToDate:curTime] ? @"true" : @"false"));
@@ -119,8 +118,7 @@ returns whether we are currently inbetween the start time and and time and on a
 	//NSString *bulletinID = bulletin.bulletinID;
 	NSString *sectionId =  bulletin.sectionID;
 
-   // HBLogDebug(@"NOTIBLOCK - Entered publish bulletin for %@ with ID: %@ ", sectionId, bulletinID);
-
+    // HBLogDebug(@"NOTIBLOCK - Entered publish bulletin for %@ with ID: %@ ", sectionId, bulletinID);
 	//HBLogDebug(@"NOTIBLOCK - BulletinID:%@         Title: %@      Subtitle: %@         Message: %@", bulletinID, title, subtitle, message );
 
 	BOOL filtered = NO;
@@ -281,7 +279,6 @@ Loads filters into memory from disk when springboard is loaded
 			[appIdfilters addObject:filter];
 
 			HBLogDebug(@"NOTIBLOCK - adding filter to dict for appkey: --%@--", dictKey);
-
 		}
 	} else {
 		HBLogDebug(@"NOTIBLOCK - springboard data load was nil");
@@ -336,7 +333,7 @@ Check for filters and block notifications if needed
 
 	bulletin.sound = nil;
 	bulletin.turnsOnDisplay = NO;
-    %orig(bulletin, arg2);
+	%orig(bulletin, arg2);
 
 	if (blockType == 2) {
 		[self _clearBulletinIDs:@[bulletin.bulletinID] forSectionID:bulletin.sectionID shouldSync:YES];

control

@@ -1,9 +1,23 @@
 Package: com.shemeshapps.notiblock
 Name: NotiBlock
 Depends: mobilesubstrate, ws.hbang.common, preferenceloader, applist
-Version: 0.0.1
+Version: 0.0.2
 Architecture: iphoneos-arm
-Description: An awesome MobileSubstrate tweak!
+Description: NotiBlock - Block notifications and take control of your digital well-being
+ Push notifications are a gift and a curse, allowing you to get notified instantly of important information, but also opening a door into letting people and apps interrupt your life without your consent. The tools Apple gives us are not powerful enough to stop the spam of notifications, and required a more advanced tool set. 
+ 
+ NotiBlock is an advanced notification blocking and filtering tweak. It lets you block notifications based many fields for simple or advanced configurations. Features include blocking based on:
+  - Content of the notification
+  - What app the notification is from
+  - Whitelist mode to only allow certain notifications through
+  - Block notifications completely or just mute them
+  - Schedules, to only block certain times and days of the week. 
+ 
+ This app is also open source. View the source code on Github: https://github.com/eclair4151/NotiBlock
+ 
+ If you like this tweak and want to help support my development of free open source tweaks, feel free to donate: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YP44VSWZCTGE4&source=url
+
+ Comptible with iOS 11 - 13.5
 Maintainer: ShemeshApps
 Author: ShemeshApps
 Section: Tweaks

notiblockpref/Makefile

@@ -8,7 +8,7 @@ NotiBlockPref_FRAMEWORKS = UIKit
 NotiBlockPref_PRIVATE_FRAMEWORKS = Preferences
 NotiBlockPref_LIBRARIES = applist
 NotiBlockPref_EXTRA_FRAMEWORKS += Cephei CepheiPrefs
-
+NotiBlockPref_CFLAGS = -fobjc-arc
 include $(THEOS_MAKE_PATH)/bundle.mk
 
 internal-stage::

notiblockpref/NBPImageTableViewCell.m

@@ -17,7 +17,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
         [self setSelectionStyle:UITableViewCellSelectionStyleNone];
         self.cellImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
 
-        NSBundle *bundle = [[[NSBundle alloc] initWithPath:@"/Library/PreferenceBundles/NotiBlockPref.bundle"] autorelease];
+        NSBundle *bundle = [[NSBundle alloc] initWithPath:@"/Library/PreferenceBundles/NotiBlockPref.bundle"];
         NSString *imagePath = [bundle pathForResource:@"example" ofType:@"png"];
         UIImage *myImage = [UIImage imageWithContentsOfFile:imagePath];
         self.cellImageView.contentMode = UIViewContentModeScaleAspectFit;

notiblockpref/NBPNotificationFilter.m

@@ -54,7 +54,7 @@ - (id)initWithDictionary:(NSDictionary *)dict {
 
 
 - (NSDictionary *)encodeToDictionary {
-  NSMutableDictionary *dict = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
+  NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
   self.filterName, @"filterName",
   self.filterText, @"filterText",
   [NSNumber numberWithInt:self.blockType], @"blockType",
@@ -65,7 +65,7 @@ - (NSDictionary *)encodeToDictionary {
   self.startTime, @"startTime",
   self.endTime, @"endTime",
   self.weekDays, @"weekDays",
-  nil] retain];
+  nil];
 
   if (self.appToBlock != nil) {
     [dict setObject:self.appToBlock.appIdentifier forKey:@"appToBlockIdentifier"];

notiblockpref/NBPRootPreferenceController.m

@@ -7,7 +7,7 @@ @implementation NBPRootPreferenceController
 
 - (NSArray *)specifiers {
 	if (!_specifiers) {
-		_specifiers = [[self loadSpecifiersFromPlistName:@"Root" target:self] retain];
+		_specifiers = [self loadSpecifiersFromPlistName:@"Root" target:self];
 	}
 
 	return _specifiers;

notiblockpref/NBPRootTableViewController.m

@@ -23,11 +23,11 @@ - (void)loadView {
 		self.filterList = [[NSMutableArray alloc] init];
 	}
 	self.title = @"Notification Filters";
-	self.navigationItem.rightBarButtonItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(addButtonTapped:)] autorelease];
+	self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(addButtonTapped:)];
 }
 
 - (void)addButtonTapped:(id)sender {	
-    NBPAddViewController *one = [[[NBPAddViewController alloc]init] autorelease];
+    NBPAddViewController *one = [[NBPAddViewController alloc]init];
 	one.delegate = self;
     UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:one];
 	if (@available(iOS 13, *)) {
@@ -51,7 +51,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 	UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
 
 	if (!cell) {
-		cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+		cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier];
 	}
 
     cell.textLabel.text = ((NotificationFilter *)self.filterList[indexPath.row]).filterName;
@@ -67,7 +67,7 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
 #pragma mark - Table View Delegate
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-	 NBPAddViewController *one = [[[NBPAddViewController alloc]init] autorelease];
+	 NBPAddViewController *one = [[NBPAddViewController alloc]init];
 	one.delegate = self;
 	one.currentFilter = [self.filterList objectAtIndex:indexPath.row];