2 files changed, 15 insertions, 4 deletions
diff --git a/src/client/ios/BreakpadController.h b/src/client/ios/BreakpadController.h
index eb59e228..be072ea9 100644
--- a/src/client/ios/BreakpadController.h
+++ b/src/client/ios/BreakpadController.h
@@ -71,6 +71,10 @@
 // new one. Merge is done by replacing the old values by the new values.
 - (void)updateConfiguration:(NSDictionary*)configuration;
 
+// Reset the controller configuration to its initial value, which is the
+// infoDictionary of the bundle of the application.
+- (void)resetConfiguration;
+
 // Configure the URL to upload the report to. This must be called at least once
 // if the URL is not in the bundle information.
 - (void)setUploadingURL:(NSString*)url;
diff --git a/src/client/ios/BreakpadController.mm b/src/client/ios/BreakpadController.mm
index ac560d18..9a6dd814 100644
--- a/src/client/ios/BreakpadController.mm
+++ b/src/client/ios/BreakpadController.mm
@@ -108,12 +108,9 @@ NSString* GetPlatform() {
   self = [super init];
   if (self) {
     queue_ = dispatch_queue_create("com.google.BreakpadQueue", NULL);
-    configuration_ = [[[NSBundle mainBundle] infoDictionary] mutableCopy];
     enableUploads_ = NO;
     started_ = NO;
-    NSString* uploadInterval =
-        [configuration_ valueForKey:@BREAKPAD_REPORT_INTERVAL];
-    [self setUploadInterval:[uploadInterval intValue]];
+    [self resetConfiguration];
   }
   return self;
 }
@@ -187,6 +184,16 @@ NSString* GetPlatform() {
     [self setUploadInterval:[uploadInterval intValue]];
 }
 
+- (void)resetConfiguration {
+  NSAssert(!started_,
+      @"The controller must not be started when resetConfiguration is called");
+  [configuration_ autorelease];
+  configuration_ = [[[NSBundle mainBundle] infoDictionary] mutableCopy];
+  NSString* uploadInterval =
+      [configuration_ valueForKey:@BREAKPAD_REPORT_INTERVAL];
+  [self setUploadInterval:[uploadInterval intValue]];
+}
+
 - (void)setUploadingURL:(NSString*)url {
   NSAssert(!started_,
       @"The controller must not be started when setUploadingURL is called");