[FIX] Фикс ProGuard для Request'ов

This commit is contained in:
Gravit 2019-04-03 23:39:33 +07:00
parent 7b695e77ad
commit 40d4003696
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
5 changed files with 16 additions and 3 deletions

View file

@ -3,6 +3,7 @@
import ru.gravit.launcher.ClientPermissions;
import ru.gravit.launcher.LauncherAPI;
import ru.gravit.launcher.LauncherConfig;
import ru.gravit.launcher.LauncherNetworkAPI;
import ru.gravit.launcher.profiles.PlayerProfile;
import ru.gravit.launcher.request.Request;
import ru.gravit.launcher.request.RequestType;
@ -26,11 +27,13 @@ private Result(PlayerProfile pp, String accessToken) {
this.accessToken = accessToken;
}
}
@LauncherNetworkAPI
private final String login;
@LauncherNetworkAPI
private final byte[] encryptedPassword;
@LauncherNetworkAPI
private final String auth_id;
@LauncherNetworkAPI
private final String title;
@LauncherAPI

View file

@ -3,6 +3,7 @@
import ru.gravit.launcher.Launcher;
import ru.gravit.launcher.LauncherAPI;
import ru.gravit.launcher.LauncherConfig;
import ru.gravit.launcher.LauncherNetworkAPI;
import ru.gravit.launcher.events.request.CheckServerRequestEvent;
import ru.gravit.launcher.profiles.PlayerProfile;
import ru.gravit.launcher.request.Request;
@ -19,7 +20,9 @@
import java.io.IOException;
public final class CheckServerRequest extends Request<CheckServerRequestEvent> implements RequestInterface {
@LauncherNetworkAPI
private final String username;
@LauncherNetworkAPI
private final String serverID;
@LauncherAPI

View file

@ -2,6 +2,7 @@
import ru.gravit.launcher.LauncherAPI;
import ru.gravit.launcher.LauncherConfig;
import ru.gravit.launcher.LauncherNetworkAPI;
import ru.gravit.launcher.events.request.JoinServerRequestEvent;
import ru.gravit.launcher.request.Request;
import ru.gravit.launcher.request.RequestType;
@ -18,8 +19,11 @@
public final class JoinServerRequest extends Request<JoinServerRequestEvent> implements RequestInterface {
// Instance
@LauncherNetworkAPI
private final String username;
@LauncherNetworkAPI
private final String accessToken;
@LauncherNetworkAPI
private final String serverID;
@LauncherAPI

View file

@ -1,6 +1,7 @@
package ru.gravit.launcher.request.auth;
import ru.gravit.launcher.LauncherConfig;
import ru.gravit.launcher.LauncherNetworkAPI;
import ru.gravit.launcher.events.request.SetProfileRequestEvent;
import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launcher.request.Request;
@ -13,7 +14,7 @@
public class SetProfileRequest extends Request<SetProfileRequestEvent> implements RequestInterface {
private transient ClientProfile profile;
@LauncherNetworkAPI
public String client;
public SetProfileRequest(LauncherConfig config, ClientProfile profile) {

View file

@ -3,6 +3,7 @@
import ru.gravit.launcher.Launcher;
import ru.gravit.launcher.LauncherAPI;
import ru.gravit.launcher.LauncherConfig;
import ru.gravit.launcher.LauncherNetworkAPI;
import ru.gravit.launcher.downloader.ListDownloader;
import ru.gravit.launcher.events.request.UpdateRequestEvent;
import ru.gravit.launcher.hasher.FileNameMatcher;
@ -220,6 +221,7 @@ public UpdateRequestEvent requestWebSockets() throws Exception {
}
// Instance
@LauncherNetworkAPI
private final String dirName;
private transient final Path dir;
private transient final FileNameMatcher matcher;