From db2047dd87997d549a9ee31287ed2c36e71fa5d5 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sun, 21 Oct 2012 16:47:13 +0000 Subject: - Merge in changes from FeedbackReporter framework master up to 9bcc34dd34396f9e0285f96a148c2071c52e7abb, including localisation improvements and code cleanu$ - Disable retrieval of user's "Me" card from the address book to avoid Security warnings about accessing Contacts on 10.8 --- .../Versions/A/FeedbackReporter | Bin 268516 -> 290264 bytes .../Versions/A/Headers/FRFeedbackReporter.h | 14 +++++++++++--- .../Armenian.lproj/FeedbackReporter.strings | Bin 4492 -> 0 bytes .../English.lproj/FeedbackReporter.strings | Bin 4518 -> 0 bytes .../Versions/A/Resources/FeedbackReporter.nib | Bin 30807 -> 0 bytes .../German.lproj/FeedbackReporter.strings | Bin 4724 -> 0 bytes .../Italian.lproj/FeedbackReporter.strings | Bin 4682 -> 0 bytes .../Russian.lproj/FeedbackReporter.strings | Bin 4608 -> 0 bytes .../A/Resources/ar.lproj/FeedbackReporter.nib | Bin 0 -> 27523 bytes .../A/Resources/ar.lproj/FeedbackReporter.strings | Bin 0 -> 3532 bytes .../A/Resources/de.lproj/FeedbackReporter.nib | Bin 0 -> 28024 bytes .../A/Resources/de.lproj/FeedbackReporter.strings | Bin 0 -> 3564 bytes .../A/Resources/en.lproj/FeedbackReporter.nib | Bin 0 -> 27523 bytes .../A/Resources/en.lproj/FeedbackReporter.strings | Bin 0 -> 3618 bytes .../A/Resources/es.lproj/FeedbackReporter.nib | Bin 0 -> 27523 bytes .../A/Resources/es.lproj/FeedbackReporter.strings | Bin 0 -> 3750 bytes .../A/Resources/fr.lproj/FeedbackReporter.nib | Bin 0 -> 27523 bytes .../A/Resources/fr.lproj/FeedbackReporter.strings | Bin 0 -> 3826 bytes .../A/Resources/hy.lproj/FeedbackReporter.nib | Bin 0 -> 27523 bytes .../A/Resources/hy.lproj/FeedbackReporter.strings | Bin 0 -> 3576 bytes .../A/Resources/it.lproj/FeedbackReporter.nib | Bin 0 -> 27523 bytes .../A/Resources/it.lproj/FeedbackReporter.strings | Bin 0 -> 3790 bytes .../A/Resources/ru.lproj/FeedbackReporter.nib | Bin 0 -> 28024 bytes .../A/Resources/ru.lproj/FeedbackReporter.strings | Bin 0 -> 3564 bytes 24 files changed, 11 insertions(+), 3 deletions(-) delete mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/Armenian.lproj/FeedbackReporter.strings delete mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/English.lproj/FeedbackReporter.strings delete mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/FeedbackReporter.nib delete mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/German.lproj/FeedbackReporter.strings delete mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/Italian.lproj/FeedbackReporter.strings delete mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/Russian.lproj/FeedbackReporter.strings create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.nib create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.strings create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.nib create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.strings create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.nib create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.strings create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.nib create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.strings create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.nib create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.strings create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.nib create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.strings create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.nib create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.strings create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.nib create mode 100644 Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.strings diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/FeedbackReporter b/Frameworks/FeedbackReporter.framework/Versions/A/FeedbackReporter index 67f472ab..722fd73e 100755 Binary files a/Frameworks/FeedbackReporter.framework/Versions/A/FeedbackReporter and b/Frameworks/FeedbackReporter.framework/Versions/A/FeedbackReporter differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Headers/FRFeedbackReporter.h b/Frameworks/FeedbackReporter.framework/Versions/A/Headers/FRFeedbackReporter.h index e1ffe927..954f7ce1 100644 --- a/Frameworks/FeedbackReporter.framework/Versions/A/Headers/FRFeedbackReporter.h +++ b/Frameworks/FeedbackReporter.framework/Versions/A/Headers/FRFeedbackReporter.h @@ -1,5 +1,5 @@ /* - * Copyright 2008, Torsten Curdt + * Copyright 2008-2011, Torsten Curdt * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,12 @@ #import -@protocol FRFeedbackReporterDelegate +@protocol FRFeedbackReporterDelegate @optional - (NSDictionary*) customParametersForFeedbackReport; - (NSMutableDictionary*) anonymizePreferencesForFeedbackReport:(NSMutableDictionary *)preferences; +- (NSString *) targetUrlForFeedbackReport; +- (NSString *) feedbackDisplayName; @end @interface FRFeedbackReporter : NSObject { @@ -29,14 +31,20 @@ id delegate; } +// Creates and returns the singleton FRFeedbackReporter. Does not perform any checks or other real work. + (FRFeedbackReporter *)sharedReporter; +// Gets/sets the delegate. - (id) delegate; - (void) setDelegate:(id) delegate; +// Displays the feedback user interface allowing the user to provide general feedback. Returns YES if it was able to display the UI, NO otherwise. - (BOOL) reportFeedback; + +// Searches the disk for crash logs, and displays the feedback user interface if there are crash logs newer than since the last check. Updates the 'last crash check date' in user defaults. Returns YES if it was able to display the UI, NO otherwise. - (BOOL) reportIfCrash; + +// Displays the feedback user interface for the given exception. Do not pass nil. Returns YES if it was able to display the UI, NO otherwise. - (BOOL) reportException:(NSException *)exception; @end - diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Armenian.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Armenian.lproj/FeedbackReporter.strings deleted file mode 100644 index f48cf8b3..00000000 Binary files a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Armenian.lproj/FeedbackReporter.strings and /dev/null differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/English.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/English.lproj/FeedbackReporter.strings deleted file mode 100644 index d52f8111..00000000 Binary files a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/English.lproj/FeedbackReporter.strings and /dev/null differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/FeedbackReporter.nib deleted file mode 100644 index 7804229c..00000000 Binary files a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/FeedbackReporter.nib and /dev/null differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/German.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/German.lproj/FeedbackReporter.strings deleted file mode 100644 index 2c55a954..00000000 Binary files a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/German.lproj/FeedbackReporter.strings and /dev/null differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Italian.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Italian.lproj/FeedbackReporter.strings deleted file mode 100644 index 504ad6c2..00000000 Binary files a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Italian.lproj/FeedbackReporter.strings and /dev/null differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Russian.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Russian.lproj/FeedbackReporter.strings deleted file mode 100644 index 176a0824..00000000 Binary files a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/Russian.lproj/FeedbackReporter.strings and /dev/null differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.nib new file mode 100644 index 00000000..a7a275a1 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.nib differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.strings new file mode 100644 index 00000000..ced0d67e Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ar.lproj/FeedbackReporter.strings differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.nib new file mode 100644 index 00000000..e970f2a5 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.nib differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.strings new file mode 100644 index 00000000..95992eb1 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/de.lproj/FeedbackReporter.strings differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.nib new file mode 100644 index 00000000..a7a275a1 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.nib differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.strings new file mode 100644 index 00000000..3e6260ae Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/en.lproj/FeedbackReporter.strings differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.nib new file mode 100644 index 00000000..a7a275a1 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.nib differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.strings new file mode 100644 index 00000000..40e4ada7 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/es.lproj/FeedbackReporter.strings differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.nib new file mode 100644 index 00000000..a7a275a1 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.nib differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.strings new file mode 100644 index 00000000..76259853 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/fr.lproj/FeedbackReporter.strings differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.nib new file mode 100644 index 00000000..a7a275a1 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.nib differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.strings new file mode 100644 index 00000000..06c2503b Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/hy.lproj/FeedbackReporter.strings differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.nib new file mode 100644 index 00000000..a7a275a1 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.nib differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.strings new file mode 100644 index 00000000..dea6fb69 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/it.lproj/FeedbackReporter.strings differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.nib b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.nib new file mode 100644 index 00000000..e970f2a5 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.nib differ diff --git a/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.strings b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.strings new file mode 100644 index 00000000..95992eb1 Binary files /dev/null and b/Frameworks/FeedbackReporter.framework/Versions/A/Resources/ru.lproj/FeedbackReporter.strings differ -- cgit v1.2.3