Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'release/2.1.2'

* release/2.1.2:
  Small refactor of last commit
  Fix another possible crash
  Fix a possible crash when building the XML string
  Fix Mac Dialog resize issues
  • Loading branch information...
commit 83f3365534710770d35a72e9b30aa6ea9ff751b8 2 parents 0f5ab64 + 49181dd
@TheRealKerni TheRealKerni authored
View
229 client/Mac/BWQuincyMain.nib/designable.nib
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">11B26</string>
- <string key="IBDocument.InterfaceBuilderVersion">1617</string>
- <string key="IBDocument.AppKitVersion">1138</string>
- <string key="IBDocument.HIToolboxVersion">566.00</string>
+ <string key="IBDocument.SystemVersion">11C74</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1938</string>
+ <string key="IBDocument.AppKitVersion">1138.23</string>
+ <string key="IBDocument.HIToolboxVersion">567.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1617</string>
+ <string key="NS.object.0">1938</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -32,11 +32,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys" id="0">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="dict.values" ref="0"/>
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="557403926">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -52,7 +49,7 @@
<object class="NSWindowTemplate" id="802234099">
<int key="NSWindowStyleMask">1</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{602, 592}, {571, 294}}</string>
+ <string key="NSWindowRect">{{602, 592}, {571, 587}}</string>
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">Crash Reporter</string>
<string key="NSWindowClass">NSWindow</string>
@@ -68,7 +65,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSBox" id="204457754">
<reference key="NSNextResponder" ref="346017069"/>
- <int key="NSvFlags">264</int>
+ <int key="NSvFlags">288</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSView" id="511659880">
@@ -174,7 +171,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
- <int key="NSFlags">4067</int>
+ <int key="NSFlags">67112931</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<object class="NSColor" key="NSBackgroundColor" id="295167230">
@@ -306,7 +303,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="NSNextKeyView" ref="696397380"/>
</object>
</object>
- <string key="NSFrame">{{112, -218}, {439, 285}}</string>
+ <string key="NSFrame">{{112, 75}, {439, 285}}</string>
<reference key="NSSuperview" ref="346017069"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="511659880"/>
@@ -340,7 +337,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<object class="NSTextField" id="494776998">
<reference key="NSNextResponder" ref="346017069"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{112, 75}, {439, 105}}</string>
+ <string key="NSFrame">{{112, 368}, {439, 105}}</string>
<reference key="NSSuperview" ref="346017069"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="69401596"/>
@@ -365,7 +362,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<object class="NSTextField" id="654062154">
<reference key="NSNextResponder" ref="346017069"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{109, 215}, {445, 59}}</string>
+ <string key="NSFrame">{{109, 508}, {445, 59}}</string>
<reference key="NSSuperview" ref="346017069"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="182606009"/>
@@ -475,7 +472,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<object class="NSButton" id="182606009">
<reference key="NSNextResponder" ref="346017069"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{112, 188}, {13, 13}}</string>
+ <string key="NSFrame">{{112, 481}, {13, 13}}</string>
<reference key="NSSuperview" ref="346017069"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="101270370"/>
@@ -500,7 +497,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<object class="NSTextField" id="101270370">
<reference key="NSNextResponder" ref="346017069"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{130, 186}, {115, 18}}</string>
+ <string key="NSFrame">{{130, 479}, {115, 18}}</string>
<reference key="NSSuperview" ref="346017069"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="494776998"/>
@@ -530,7 +527,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{20, 210}, {64, 64}}</string>
+ <string key="NSFrame">{{20, 503}, {64, 64}}</string>
<reference key="NSSuperview" ref="346017069"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="654062154"/>
@@ -576,7 +573,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</object>
</object>
- <string key="NSFrameSize">{571, 294}</string>
+ <string key="NSFrameSize">{571, 587}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="828078923"/>
@@ -594,14 +591,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<object class="NSMutableArray" key="connectionRecords">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">initialFirstResponder</string>
- <reference key="source" ref="802234099"/>
- <reference key="destination" ref="154373665"/>
- </object>
- <int key="connectionID">395</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">submitReport:</string>
<reference key="source" ref="265051856"/>
@@ -611,14 +600,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">delegate</string>
- <reference key="source" ref="802234099"/>
- <reference key="destination" ref="265051856"/>
- </object>
- <int key="connectionID">399</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">window</string>
<reference key="source" ref="265051856"/>
<reference key="destination" ref="802234099"/>
@@ -690,64 +671,52 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="connectionID">417</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: self</string>
- <reference key="source" ref="436407902"/>
- <reference key="destination" ref="265051856"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="436407902"/>
- <reference key="NSDestination" ref="265051856"/>
- <string key="NSLabel">value: self</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">self</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
+ <object class="IBActionConnection" key="connection">
+ <string key="label">cancelReport:</string>
+ <reference key="source" ref="265051856"/>
+ <reference key="destination" ref="640734563"/>
</object>
- <int key="connectionID">419</int>
+ <int key="connectionID">454</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: showComments</string>
- <reference key="source" ref="182606009"/>
- <reference key="destination" ref="265051856"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="182606009"/>
- <reference key="NSDestination" ref="265051856"/>
- <string key="NSLabel">value: showComments</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">showComments</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">descriptionTextField</string>
+ <reference key="source" ref="265051856"/>
+ <reference key="destination" ref="494776998"/>
</object>
- <int key="connectionID">438</int>
+ <int key="connectionID">458</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">hidden: showDetails</string>
- <reference key="source" ref="204457754"/>
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">noteText</string>
+ <reference key="source" ref="265051856"/>
+ <reference key="destination" ref="54059672"/>
+ </object>
+ <int key="connectionID">479</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">initialFirstResponder</string>
+ <reference key="source" ref="802234099"/>
+ <reference key="destination" ref="154373665"/>
+ </object>
+ <int key="connectionID">395</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="802234099"/>
<reference key="destination" ref="265051856"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="204457754"/>
- <reference key="NSDestination" ref="265051856"/>
- <string key="NSLabel">hidden: showDetails</string>
- <string key="NSBinding">hidden</string>
- <string key="NSKeyPath">showDetails</string>
- <object class="NSDictionary" key="NSOptions">
- <string key="NS.key.0">NSValueTransformerName</string>
- <string key="NS.object.0">NSNegateBoolean</string>
- </object>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
</object>
- <int key="connectionID">444</int>
+ <int key="connectionID">399</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">hidden: showDetails</string>
- <reference key="source" ref="483277688"/>
+ <reference key="source" ref="204457754"/>
<reference key="destination" ref="265051856"/>
<object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="483277688"/>
+ <reference key="NSSource" ref="204457754"/>
<reference key="NSDestination" ref="265051856"/>
<string key="NSLabel">hidden: showDetails</string>
<string key="NSBinding">hidden</string>
@@ -759,47 +728,23 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
- <int key="connectionID">452</int>
+ <int key="connectionID">444</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">hidden: showDetails</string>
- <reference key="source" ref="69401596"/>
+ <string key="label">value: showComments</string>
+ <reference key="source" ref="182606009"/>
<reference key="destination" ref="265051856"/>
<object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="69401596"/>
+ <reference key="NSSource" ref="182606009"/>
<reference key="NSDestination" ref="265051856"/>
- <string key="NSLabel">hidden: showDetails</string>
- <string key="NSBinding">hidden</string>
- <string key="NSKeyPath">showDetails</string>
+ <string key="NSLabel">value: showComments</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">showComments</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
- <int key="connectionID">453</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">cancelReport:</string>
- <reference key="source" ref="265051856"/>
- <reference key="destination" ref="640734563"/>
- </object>
- <int key="connectionID">454</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">descriptionTextField</string>
- <reference key="source" ref="265051856"/>
- <reference key="destination" ref="494776998"/>
- </object>
- <int key="connectionID">458</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">noteText</string>
- <reference key="source" ref="265051856"/>
- <reference key="destination" ref="54059672"/>
- </object>
- <int key="connectionID">479</int>
+ <int key="connectionID">438</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
@@ -844,6 +789,58 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
+ <string key="label">value: self</string>
+ <reference key="source" ref="436407902"/>
+ <reference key="destination" ref="265051856"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="436407902"/>
+ <reference key="NSDestination" ref="265051856"/>
+ <string key="NSLabel">value: self</string>
+ <string key="NSBinding">value</string>
+ <string key="NSKeyPath">self</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">419</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">hidden: showDetails</string>
+ <reference key="source" ref="69401596"/>
+ <reference key="destination" ref="265051856"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="69401596"/>
+ <reference key="NSDestination" ref="265051856"/>
+ <string key="NSLabel">hidden: showDetails</string>
+ <string key="NSBinding">hidden</string>
+ <string key="NSKeyPath">showDetails</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">453</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">hidden: showDetails</string>
+ <reference key="source" ref="483277688"/>
+ <reference key="destination" ref="265051856"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="483277688"/>
+ <reference key="NSDestination" ref="265051856"/>
+ <string key="NSLabel">hidden: showDetails</string>
+ <string key="NSBinding">hidden</string>
+ <string key="NSKeyPath">showDetails</string>
+ <object class="NSDictionary" key="NSOptions">
+ <string key="NS.key.0">NSValueTransformerName</string>
+ <string key="NS.object.0">NSNegateBoolean</string>
+ </object>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">452</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
<string key="label">hidden: showComments</string>
<reference key="source" ref="494776998"/>
<reference key="destination" ref="265051856"/>
@@ -876,7 +873,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
- <reference key="object" ref="0"/>
+ <object class="NSArray" key="object" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
<reference key="children" ref="557403926"/>
<nil key="parent"/>
</object>
@@ -1386,10 +1385,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1050" key="NS.object.0"/>
</object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1070" key="NS.object.0"/>
- </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
<integer value="3000" key="NS.object.0"/>
View
BIN  client/Mac/BWQuincyMain.nib/keyedobjects.nib
Binary file not shown
View
8 client/Mac/BWQuincyManager.m
@@ -375,6 +375,14 @@ - (id)init:(id)delegate crashFile:(NSString *)crashFile companyName:(NSString *)
_applicationName = applicationName;
[self setShowComments: YES];
[self setShowDetails: NO];
+
+ NSRect windowFrame = [[self window] frame];
+ windowFrame.size = NSMakeSize(windowFrame.size.width, windowFrame.size.height - kDetailsHeight);
+ windowFrame.origin.y -= kDetailsHeight;
+ [[self window] setFrame: windowFrame
+ display: YES
+ animate: NO];
+
}
return self;
}
View
24 client/iOS/BWQuincyManager.m
@@ -505,7 +505,7 @@ - (void)_performSendingCrashReports {
[self _getDevicePlatform],
[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"],
report.applicationInfo.applicationVersion,
- [crashLogString stringByReplacingOccurrencesOfString:@"]]>" withString:@"]]" @"]]><![CDATA[" @">" options:NSLiteralSearch range:NSMakeRange(0,description.length)],
+ [crashLogString stringByReplacingOccurrencesOfString:@"]]>" withString:@"]]" @"]]><![CDATA[" @">" options:NSLiteralSearch range:NSMakeRange(0,crashLogString.length)],
userid,
contact,
[description stringByReplacingOccurrencesOfString:@"]]>" withString:@"]]" @"]]><![CDATA[" @">" options:NSLiteralSearch range:NSMakeRange(0,description.length)]];
@@ -657,6 +657,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
if (_statusCode >= 200 && _statusCode < 400) {
[self _cleanCrashReports];
+ _feedbackRequestID = nil;
if (self.appIdentifier) {
// HockeyApp uses PList XML format
NSMutableDictionary *response = [NSPropertyListSerialization propertyListFromData:_responseData
@@ -664,10 +665,12 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
format:nil
errorDescription:NULL];
_serverResult = (CrashReportStatus)[[response objectForKey:@"status"] intValue];
- _feedbackRequestID = [[NSString alloc] initWithString:[response objectForKey:@"id"]];
- _feedbackDelayInterval = [[response objectForKey:@"delay"] floatValue];
- if (_feedbackDelayInterval > 0)
- _feedbackDelayInterval *= 0.01;
+ if ([response objectForKey:@"id"]) {
+ _feedbackRequestID = [[NSString alloc] initWithString:[response objectForKey:@"id"]];
+ _feedbackDelayInterval = [[response objectForKey:@"delay"] floatValue];
+ if (_feedbackDelayInterval > 0)
+ _feedbackDelayInterval *= 0.01;
+ }
} else {
NSXMLParser *parser = [[NSXMLParser alloc] initWithData:_responseData];
// Set self as the delegate of the parser so that it will receive the parser delegate methods callbacks.
@@ -683,15 +686,12 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
}
if ([self isFeedbackActivated]) {
- if (self.appIdentifier) {
- // only proceed if the server did not report any problem
- if (_serverResult == CrashReportStatusQueued) {
- // the report is still in the queue
+ // only proceed if the server did not report any problem
+ if ((self.appIdentifier) && (_serverResult == CrashReportStatusQueued)) {
+ // the report is still in the queue
+ if (_feedbackRequestID) {
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(_checkForFeedbackStatus) object:nil];
[self performSelector:@selector(_checkForFeedbackStatus) withObject:nil afterDelay:_feedbackDelayInterval];
- } else {
- // we do have a status, show it if needed
- [self showCrashStatusMessage];
}
} else {
[self showCrashStatusMessage];
Please sign in to comment.
Something went wrong with that request. Please try again.