fabian/telegram_backup
1
0
Fork 0
mirror of https://github.com/fabianonline/telegram_backup.git synced 2024-11-22 16:56:16 +00:00
Code Issues Releases Wiki Activity

Improvements in account handling; detection for a mismatch between selected account and used account authorization.

Browse Source
This commit is contained in:
Fabian Schlenz 2016-07-26 05:54:11 +02:00
parent 8a266dedfe
commit 458894a8bf
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/de/fabianonline/telegram_backup/CommandLineController.java
View File

@ -118,10 +118,16 @@ public class CommandLineController {
logger.info("Creating UserManager"); logger.info("Creating UserManager");
user = new UserManager(client); user = new UserManager(client);
if (!CommandLineOptions.cmd_login && user.getUser()==null) { if (!CommandLineOptions.cmd_login && !user.isLoggedIn()) {
System.out.println("Your authorization data is invalid or missing. You will have to login with Telegram again."); System.out.println("Your authorization data is invalid or missing. You will have to login with Telegram again.");
CommandLineOptions.cmd_login = true; CommandLineOptions.cmd_login = true;
} }
if (account!=null && user.isLoggedIn()) {
if (!account.equals("+" + user.getUser().getPhone())) {
logger.error("Account: {}, user.getUser().getPhone(): +{}", account, user.getUser().getPhone());
throw new RuntimeException("Account / User mismatch");
}
}
logger.debug("CommandLineOptions.val_export: {}", CommandLineOptions.val_export); logger.debug("CommandLineOptions.val_export: {}", CommandLineOptions.val_export);
if (CommandLineOptions.val_export != null) { if (CommandLineOptions.val_export != null) {
@ -142,7 +148,11 @@ public class CommandLineController {
System.exit(0); System.exit(0);
} }
System.out.println("You are logged in as " + user.getUserString()); if (user.isLoggedIn()) {
System.out.println("You are logged in as " + user.getUserString());
} else {
System.out.println("You are not logged in.");
}
logger.info("Initializing Download Manager"); logger.info("Initializing Download Manager");
DownloadManager d = new DownloadManager(user, client, new CommandLineDownloadProgress()); DownloadManager d = new DownloadManager(user, client, new CommandLineDownloadProgress());
@ -178,13 +188,13 @@ public class CommandLineController {
user.verifyCode(code); user.verifyCode(code);
if (user.isPasswordNeeded()) { if (user.isPasswordNeeded()) {
System.out.println("We also need your account password."); System.out.println("We also need your account password. Please enter it now. It should not be printed, so it's okay if you see nothing while typing it.");
String pw = getPassword(); String pw = getPassword();
user.verifyPassword(pw); user.verifyPassword(pw);
} }
storage.setPrefix("+" + user.getUser().getPhone()); storage.setPrefix("+" + user.getUser().getPhone());
System.out.println("Please run this tool with '--account +" + user.getUser().getPhone() + " to use this account."); System.out.println("Everything seems fine. Please run this tool again with '--account +" + user.getUser().getPhone() + " to use this account.");
} }
private String getLine() { private String getLine() {