sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

remove properties from sip-communicator.xml

Browse Source
cusax-fix
Yana Stamcheva 20 years ago
parent 7e1d7b332c
commit 6080f0b6f7
6 changed files with 17 additions and 76 deletions
Show Stats Download Patch File Download Diff File

10
src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
Unescape View File

@ -220,15 +220,17 @@ public void pageBack() {
* @param protocolProvider The <tt>ProtocolProviderService</tt> to load the
* data from.
*/
public void loadAccount(ProtocolProviderService protocolProvider,
boolean rememberPassword) {
public void loadAccount(ProtocolProviderService protocolProvider) {
AccountID accountID = protocolProvider.getAccountID();
String password = (String)accountID.getAccountProperties()
.get(ProtocolProviderFactory.PASSWORD);
this.uinField.setText(accountID.getUserID());
this.passField.setText(password);
this.rememberPassBox.setSelected(rememberPassword);
if(password != null) {
this.passField.setText(password);
this.rememberPassBox.setSelected(true);
}
}
}

16
src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccRegWizzActivator.java
Unescape View File

@ -73,20 +73,4 @@ public static ProtocolProviderFactory getIcqProtocolProviderFactory() {
return (ProtocolProviderFactory) bundleContext.getService(serRefs[0]);
}
/**
* Returns the <tt>ConfigurationService</tt>.
* @return the <tt>ConfigurationService</tt>
*/
public static ConfigurationService getConfigurationService() {
if(configService == null) {
ServiceReference configReference = bundleContext
.getServiceReference(ConfigurationService.class.getName());
configService = (ConfigurationService) bundleContext
.getService(configReference);
}
return configService;
}
}

24
src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
Unescape View File

@ -8,11 +8,11 @@
import java.util.*;
import org.osgi.framework.*;
import net.java.sip.communicator.service.configuration.*;
import net.java.sip.communicator.service.gui.*;
import net.java.sip.communicator.service.protocol.*;
import org.osgi.framework.*;
/**
* The <tt>IcqAccountRegistrationWizard</tt> is an implementation of the
* <tt>AccountRegistrationWizard</tt> for the ICQ protocol. It should allow
@ -29,13 +29,8 @@ public class IcqAccountRegistrationWizard implements AccountRegistrationWizard {
private WizardContainer wizardContainer;
ConfigurationService configService
= IcqAccRegWizzActivator.getConfigurationService();
private ProtocolProviderService protocolProvider;
private String propertiesPackage = "net.java.sip.communicator.plugin.icqaccregwizz";
/**
* Creates an instance of <tt>IcqAccountRegistrationWizard</tt>.
* @param wizardContainer the wizard container, where this wizard
@ -132,12 +127,7 @@ public ProtocolProviderService installAccount(
AccountID accountID = providerFactory.installAccount(
user, accountProperties);
configService.setProperty(
propertiesPackage + ".REMEMBER_PASSWORD",
new Boolean(registration.isRememberPassword())
);
ServiceReference serRef = providerFactory
.getProviderForAccount(accountID);
@ -158,12 +148,6 @@ public void loadAccount(ProtocolProviderService protocolProvider) {
this.protocolProvider = protocolProvider;
boolean rememberPassword
= new Boolean(configService
.getString(propertiesPackage + ".REMEMBER_PASSWORD"))
.booleanValue();
this.firstWizardPage.loadAccount(
protocolProvider, rememberPassword);
this.firstWizardPage.loadAccount(protocolProvider);
}
}

11
src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
Unescape View File

@ -265,16 +265,17 @@ public void pageBack() {
* @param protocolProvider The <tt>ProtocolProviderService</tt> to load the
* data from.
*/
public void loadAccount(ProtocolProviderService protocolProvider,
boolean rememberPassword) {
public void loadAccount(ProtocolProviderService protocolProvider) {
AccountID accountID = protocolProvider.getAccountID();
String password = (String)accountID.getAccountProperties()
.get(ProtocolProviderFactory.PASSWORD);
this.uinField.setText(accountID.getUserID());
this.passField.setText(password);
this.rememberPassBox.setSelected(rememberPassword);
if(password != null) {
this.passField.setText(password);
this.rememberPassBox.setSelected(true);
}
}
/**

16
src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccRegWizzActivator.java
Unescape View File

@ -75,20 +75,4 @@ public static ProtocolProviderFactory getJabberProtocolProviderFactory() {
return (ProtocolProviderFactory) bundleContext.getService(serRefs[0]);
}
/**
* Returns the <tt>ConfigurationService</tt>.
* @return the <tt>ConfigurationService</tt>
*/
public static ConfigurationService getConfigurationService() {
if(configService == null) {
ServiceReference configReference = bundleContext
.getServiceReference(ConfigurationService.class.getName());
configService = (ConfigurationService) bundleContext
.getService(configReference);
}
return configService;
}
}

16
src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
Unescape View File

@ -29,9 +29,6 @@ public class JabberAccountRegistrationWizard implements AccountRegistrationWizar
private WizardContainer wizardContainer;
ConfigurationService configService
= JabberAccRegWizzActivator.getConfigurationService();
private ProtocolProviderService protocolProvider;
private String propertiesPackage = "net.java.sip.communicator.plugin.jabberaccregwizz";
@ -145,11 +142,6 @@ public ProtocolProviderService installAccount(
AccountID accountID = providerFactory.installAccount(
user, accountProperties);
configService.setProperty(
propertiesPackage + ".REMEMBER_PASSWORD",
new Boolean(registration.isRememberPassword())
);
ServiceReference serRef = providerFactory
.getProviderForAccount(accountID);
@ -170,12 +162,6 @@ public void loadAccount(ProtocolProviderService protocolProvider) {
this.protocolProvider = protocolProvider;
boolean rememberPassword
= new Boolean(configService
.getString(propertiesPackage + ".REMEMBER_PASSWORD"))
.booleanValue();
this.firstWizardPage.loadAccount(
protocolProvider, rememberPassword);
this.firstWizardPage.loadAccount(protocolProvider);
}
}

Write Preview
Loading…
Cancel
Save