From 431f047c8e801a798fea2740dbe4b29aea5efcb1 Mon Sep 17 00:00:00 2001 From: tonikelope Date: Sat, 31 Dec 2022 16:47:08 +0100 Subject: [PATCH] 7.57 https://github.com/tonikelope/megabasterd/issues/470 https://github.com/tonikelope/megabasterd/issues/493 https://github.com/tonikelope/megabasterd/issues/439 FORMAT FOR MEGA ACCOUNTS TXT FILE: EMAIL1#PASS1 EMAIL2#PASS2 EMAIL3#PASS3 (Be careful with passwords with "problematic" chars (like ' ', '#', etc) --- .../java/com/tonikelope/megabasterd/SettingsDialog.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java index 88a53dc4c..c4a742681 100644 --- a/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java +++ b/src/main/java/com/tonikelope/megabasterd/SettingsDialog.java @@ -2980,7 +2980,7 @@ public class SettingsDialog extends javax.swing.JDialog { if (!unlock_accounts_button.isVisible() || !unlock_accounts_button.isEnabled()) { - JOptionPane.showMessageDialog(this, LabelTranslatorSingleton.getInstance().translate("EMAIL1\nPASS1\nEMAIL2\nPASS2"), "TXT FILE FORMAT", JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(this, LabelTranslatorSingleton.getInstance().translate("EMAIL1#PASS1\nEMAIL2#PASS2"), "TXT FILE FORMAT", JOptionPane.INFORMATION_MESSAGE); javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser(); @@ -3005,9 +3005,11 @@ public class SettingsDialog extends javax.swing.JDialog { DefaultTableModel model = (DefaultTableModel) mega_accounts_table.getModel(); - for (int i = 0; i < result.size() - 1; i += 2) { + for (String line : result) { - model.addRow(new Object[]{result.get(i), result.get(i + 1)}); + String email = MiscTools.findFirstRegex("^[^#]+", line, 0).trim(); + String pass = MiscTools.findFirstRegex("^[^#]+#(.+)$", line, 1); + model.addRow(new Object[]{email, pass}); } mega_accounts_table.setModel(model);