When creating new account (simple or advance form) make sure we don't reuse old AccountRegistration instances.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java
index 0129b1b..ce8ba2a 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java
@@ -108,6 +108,13 @@ public class GoogleTalkAccountRegistrationWizard
     public Iterator<WizardPage> getPages()

     {

         java.util.List<WizardPage> pages = new ArrayList<WizardPage>();

+

+        // create new registration, our container needs the pages

+        // this means this is a new wizard and we must reset all data

+        // it will be invoked and when the wizard cleans and unregister

+        // our pages, but this fix don't hurt in this situation.

+        this.registration = new GoogleTalkAccountRegistration();

+

         firstWizardPage = new FirstWizardPage(this);

 

         pages.add(firstWizardPage);

@@ -431,6 +438,11 @@ public class GoogleTalkAccountRegistrationWizard
 

     public Object getSimpleForm()

     {

+        // when creating first wizard page, create and new

+        // AccountRegistration to avoid reusing old instances and

+        // data left from old registrations

+        registration = new GoogleTalkAccountRegistration();

+

         firstWizardPage = new FirstWizardPage(this);

         return firstWizardPage.getSimpleForm();

     }