Changeset 989 for java/installer2/src/net/oni2/aeinstaller

Timestamp:

Mar 29, 2014, 11:56:52 PM (11 years ago)

Author:

alloc

Message:

AEI 2.18:

• Fix #73

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• gui/reporter/ReporterDialog.java (modified) (5 diffs)
• localization/ReporterDialog.properties (modified) (1 diff)

java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.17
+appversion=.18

java/installer2/src/net/oni2/aeinstaller/gui/reporter/ReporterDialog.java

@@ -14 +14 @@
 import javax.activation.FileDataSource;
 import javax.mail.AuthenticationFailedException;
-import javax.mail.Authenticator;
 import javax.mail.Message;
 import javax.mail.Message.RecipientType;
 import javax.mail.MessagingException;
 import javax.mail.Multipart;
-import javax.mail.PasswordAuthentication;
 import javax.mail.Session;
 import javax.mail.Transport;
@@ -69 +67 @@
 
         private final String SMTP_HOST_NAME = "mail.illy.bz";
-        private final String SMTP_AUTH_USER = "aei_reports@oni2.net";
-        private final String SMTP_AUTH_PWD = "mb0NkjHuWrDFfMDe2BkUDU2Dknkkvq";
         private final String EMAIL_SUBJECT = "AE support request";
         private final String EMAIL_TO = "ae-support@oni2.net";
@@ -104 +100 @@
         }
 
-        private class SMTPAuthenticator extends Authenticator {
-                public PasswordAuthentication getPasswordAuthentication() {
-                        String username = SMTP_AUTH_USER;
-                        String password = SMTP_AUTH_PWD;
-                        return new PasswordAuthentication(username, password);
-                }
-        }
-
         @DoInBackground(progressMessage = "send.title", cancelable = false, indeterminateProgress = true)
         private boolean send(final BackgroundEvent evt) {
@@ -124 +112 @@
                         Properties props = new Properties();
                         props.put("mail.smtp.host", SMTP_HOST_NAME);
-                        props.put("mail.smtp.auth", "true");
-                        Authenticator auth = new SMTPAuthenticator();
-                        Session session = Session.getDefaultInstance(props, auth);
+                        Session session = Session.getDefaultInstance(props);
 
                         session.setDebug(false);
@@ -184 +170 @@
                         } else {
                                 msgText.append("Installation.log does not exist!\n");
+                        }
+
+                        // daodan.ini
+                        f = new File(Paths.getEditionBasePath(), "daodan.ini");
+                        if (f.exists()) {
+                                mimeBody = new MimeBodyPart();
+                                source = new FileDataSource(f);
+                                mimeBody.setDataHandler(new DataHandler(source));
+                                mimeBody.setFileName("daodan.ini");
+                                multipart.addBodyPart(mimeBody);
+                        } else {
+                                msgText.append("daodan.ini does not exist!\n");
                         }
 

java/installer2/src/net/oni2/aeinstaller/localization/ReporterDialog.properties

@@ -12 +12 @@
 <li>AEI's aei_output.log, updater_output.log, Initialization.log, Installation.log</li>\
 <li>Oni's startup.txt and debugger.txt</li>\
+<li>Daodan's daodan.ini</li>\
 <li>A list of all files below your AE/ folder</li>\
 </ul>None of this will include any personal data.