Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 14 insertions, 15 deletions

diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ErrorReportConfigurable.java b/platform/platform-impl/src/com/intellij/diagnostic/ErrorReportConfigurable.java
index 7d5688c9d1d8..3f865dd19abd 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/ErrorReportConfigurable.java
+++ b/platform/platform-impl/src/com/intellij/diagnostic/ErrorReportConfigurable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,17 +21,11 @@ import com.intellij.openapi.util.DefaultJDOMExternalizer;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMExternalizable;
 import com.intellij.openapi.util.WriteExternalException;
-import org.apache.commons.codec.binary.Base64;
+import com.intellij.openapi.vfs.CharsetToolkit;
+import com.intellij.util.Base64;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 
-/**
- * Created by IntelliJ IDEA.
- * User: stathik
- * Date: Aug 11, 2003
- * Time: 8:59:04 PM
- * To change this template use Options | File Templates.
- */
 public class ErrorReportConfigurable implements JDOMExternalizable, NamedComponent {
   public String ITN_LOGIN = "";
   public String ITN_PASSWORD_CRYPT = "";
@@ -43,31 +37,36 @@ public class ErrorReportConfigurable implements JDOMExternalizable, NamedCompone
     return ServiceManager.getService(ErrorReportConfigurable.class);
   }
 
+  @Override
   public void readExternal(Element element) throws InvalidDataException {
     DefaultJDOMExternalizer.readExternal(this, element);
-    if (! KEEP_ITN_PASSWORD)
+    if (!KEEP_ITN_PASSWORD) {
       ITN_PASSWORD_CRYPT = "";
+    }
   }
 
+  @Override
   public void writeExternal(Element element) throws WriteExternalException {
     String itnPassword = ITN_PASSWORD_CRYPT;
-    if (! KEEP_ITN_PASSWORD)
+    if (!KEEP_ITN_PASSWORD) {
       ITN_PASSWORD_CRYPT = "";
+    }
     DefaultJDOMExternalizer.writeExternal(this, element);
 
     ITN_PASSWORD_CRYPT = itnPassword;
   }
 
+  @Override
   @NotNull
   public String getComponentName() {
     return "ErrorReportConfigurable";
   }
 
-  public String getPlainItnPassword () {
-    return new String(new Base64().decode(ErrorReportConfigurable.getInstance().ITN_PASSWORD_CRYPT.getBytes()));
+  public String getPlainItnPassword() {
+    return new String(Base64.decode(getInstance().ITN_PASSWORD_CRYPT), CharsetToolkit.UTF8_CHARSET);
   }
 
-  public void setPlainItnPassword (String password) {
-    ITN_PASSWORD_CRYPT = new String(new Base64().encode(password.getBytes()));
+  public void setPlainItnPassword(String password) {
+    ITN_PASSWORD_CRYPT = Base64.encode(password.getBytes(CharsetToolkit.UTF8_CHARSET));
   }
 }