Skip to content
This repository was archived by the owner on Feb 19, 2020. It is now read-only.

Commit 7805b8d

Browse files
author
Andreas Linde
committed
Merge branch 'release/3.7.2'
2 parents 7ef9478 + b326798 commit 7805b8d

14 files changed

+514
-192
lines changed

Classes/BITCrashReportTextFormatter.m

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ + (NSString *)stringValueForCrashReport:(BITPLCrashReport *)report crashReporter
298298
lp64 = true;
299299
break;
300300
}
301-
}
301+
}
302302
}
303303

304304
{
@@ -344,10 +344,12 @@ + (NSString *)stringValueForCrashReport:(BITPLCrashReport *)report crashReporter
344344
processPath = report.processInfo.processPath;
345345

346346
/* Remove username from the path */
347+
#if TARGET_IPHONE_SIMULATOR
347348
if ([processPath length] > 0)
348349
processPath = [processPath stringByAbbreviatingWithTildeInPath];
349350
if ([processPath length] > 0 && [[processPath substringToIndex:1] isEqualToString:@"~"])
350351
processPath = [NSString stringWithFormat:@"/Users/USER%@", [processPath substringFromIndex:1]];
352+
#endif
351353
}
352354

353355
/* Parent Process Name */
@@ -562,11 +564,17 @@ + (NSString *)stringValueForCrashReport:(BITPLCrashReport *)report crashReporter
562564

563565
/* Remove username from the image path */
564566
NSString *imageName = @"";
565-
if (imageInfo.imageName && [imageInfo.imageName length] > 0)
567+
if (imageInfo.imageName && [imageInfo.imageName length] > 0) {
568+
#if TARGET_IPHONE_SIMULATOR
566569
imageName = [imageInfo.imageName stringByAbbreviatingWithTildeInPath];
570+
#else
571+
imageName = imageInfo.imageName;
572+
#endif
573+
}
574+
#if TARGET_IPHONE_SIMULATOR
567575
if ([imageName length] > 0 && [[imageName substringToIndex:1] isEqualToString:@"~"])
568576
imageName = [NSString stringWithFormat:@"/Users/USER%@", [imageName substringFromIndex:1]];
569-
577+
#endif
570578
[text appendFormat: fmt,
571579
imageInfo.imageBaseAddress,
572580
imageInfo.imageBaseAddress + (MAX(1, imageInfo.imageSize) - 1), // The Apple format uses an inclusive range

Classes/BITFeedbackListViewController.m

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ @interface BITFeedbackListViewController () <BITFeedbackUserDataDelegate, BITFee
8181
@implementation BITFeedbackListViewController {
8282
NSInteger _deleteButtonSection;
8383
NSInteger _userButtonSection;
84+
85+
NSInteger _numberOfSectionsBeforeRotation;
86+
NSInteger _numberOfMessagesBeforeRotation;
8487
}
8588

8689
- (instancetype)initWithStyle:(UITableViewStyle)style {
@@ -91,6 +94,10 @@ - (instancetype)initWithStyle:(UITableViewStyle)style {
9194
_userButtonSection = -1;
9295
_userDataComposeFlow = NO;
9396

97+
_numberOfSectionsBeforeRotation = -1;
98+
_numberOfMessagesBeforeRotation = -1;
99+
100+
94101
_lastUpdateDateFormatter = [[NSDateFormatter alloc] init];
95102
[_lastUpdateDateFormatter setDateStyle:NSDateFormatterShortStyle];
96103
[_lastUpdateDateFormatter setTimeStyle:NSDateFormatterShortStyle];
@@ -394,8 +401,17 @@ - (void)feedbackComposeViewController:(BITFeedbackComposeViewController *)compos
394401
#pragma mark - UIViewController Rotation
395402

396403
- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
404+
_numberOfSectionsBeforeRotation = [self numberOfSectionsInTableView:self.tableView];
405+
_numberOfMessagesBeforeRotation = [self.manager numberOfMessages];
406+
[self.tableView reloadData];
397407
[self.tableView beginUpdates];
398408
[self.tableView endUpdates];
409+
410+
_numberOfSectionsBeforeRotation = -1;
411+
_numberOfMessagesBeforeRotation = -1;
412+
[self.tableView reloadData];
413+
414+
[super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
399415
}
400416

401417
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientation {
@@ -406,6 +422,9 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)orientati
406422
#pragma mark - Table view data source
407423

408424
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
425+
if (_numberOfSectionsBeforeRotation >= 0)
426+
return _numberOfSectionsBeforeRotation;
427+
409428
NSInteger sections = 2;
410429
_deleteButtonSection = -1;
411430
_userButtonSection = -1;
@@ -425,6 +444,8 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
425444

426445
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
427446
if (section == 1) {
447+
if (_numberOfMessagesBeforeRotation >= 0)
448+
return _numberOfMessagesBeforeRotation;
428449
return [self.manager numberOfMessages];
429450
} else {
430451
return 1;

Classes/BITFeedbackManager.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ typedef NS_ENUM(NSInteger, BITFeedbackObservationMode) {
228228
All NSString-Content in the array will be concatenated and result in the message,
229229
while all UIImage and NSData-instances will be turned into attachments.
230230
231-
@param items an NSArray with objects that should be attached
232231
@see `[BITFeedbackComposeViewController prepareWithItems:]`
233232
*/
234233
@property (nonatomic, copy) NSArray *feedbackComposerPreparedItems;

HockeySDK-Source.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'HockeySDK-Source'
3-
s.version = '3.7.1'
3+
s.version = '3.7.2'
44

55
s.summary = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
66
s.description = <<-DESC
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
1212
DESC
1313

1414
s.homepage = 'http://hockeyapp.net/'
15-
s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.7.1/'
15+
s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.7.2/'
1616

1717
s.license = 'MIT'
1818
s.author = { 'Andreas Linde' => '[email protected]', 'Thomas Dohmke' => "[email protected]" }
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
2525
s.frameworks = 'AssetsLibrary', 'CoreText', 'CoreGraphics', 'MobileCoreServices', 'QuartzCore', 'QuickLook', 'Security', 'SystemConfiguration', 'UIKit'
2626
s.libraries = 'c++'
2727
s.ios.vendored_frameworks = 'Vendor/CrashReporter.framework'
28-
s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"42\\"" BITHOCKEY_C_BUILD="\\"42\\""} }
28+
s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"44\\"" BITHOCKEY_C_BUILD="\\"44\\""} }
2929
s.resource_bundle = { 'HockeySDKResources' => ['Resources/*.png', 'Resources/*.lproj'] }
3030
s.preserve_paths = 'Resources', 'Support'
3131
s.private_header_files = 'Classes/*Private.h'

HockeySDK.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'HockeySDK'
3-
s.version = '3.7.1'
3+
s.version = '3.7.2'
44

55
s.summary = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
66
s.description = <<-DESC
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
1212
DESC
1313

1414
s.homepage = 'http://hockeyapp.net/'
15-
s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.7.1/'
15+
s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.7.2/'
1616

1717
s.license = { :type => 'MIT', :file => 'HockeySDK-iOS/LICENSE' }
1818
s.author = { 'Andreas Linde' => '[email protected]', 'Thomas Dohmke' => "[email protected]" }

0 commit comments

Comments
 (0)