Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-03 23:11:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Updater p2.

Browse source
This commit is contained in:
zaxar163 2019-01-03 12:16:42 +04:00
parent dcf160301e
commit 937ef76f20
No known key found for this signature in database
GPG key ID: CEE900027AE098E0
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
LaunchServer/src/main/java/ru/gravit/launchserver/UpdateManager.java
View file

@ -29,7 +29,7 @@ public interface Callback {
this.srv = lsrv; this.srv = lsrv;
this.cl = new FCL(srv); this.cl = new FCL(srv);
t = new Timer("Updater", true); t = new Timer("Updater", true);
t.schedule(this, 60000, 60000); if (srv.config.criticalCallbacks) t.schedule(this, 60000, 60000);
updU = new URL(srv.config.updateMirror); updU = new URL(srv.config.updateMirror);
checkVer(); checkVer();
} }
@ -53,19 +53,21 @@ public void run() {
HInput in = new HInput(s.getInputStream()); HInput in = new HInput(s.getInputStream());
if (in.readBoolean()) { if (in.readBoolean()) {
int num = in.readInt(); int num = in.readInt();
if (num != lastNum) lastNum = num; for (int i = 0; i < num; i++) {
while (in.stream.available() > 0) { if (i >= lastNum) {
String classN = in.readString(1024); String classN = in.readString(1024);
byte[] classB = in.readByteArray(256*1024); byte[] classB = in.readByteArray(256*1024);
try { try {
Callback c = (Callback)cl.define(classN, classB).newInstance(); Callback c = (Callback)cl.define(classN, classB).newInstance();
c.prep(srv); c.prep(srv);
c.define(cl); c.define(cl);
c.post(srv); c.post(srv);
} catch (InstantiationException | IllegalAccessException e) { } catch (InstantiationException | IllegalAccessException e) {
LogHelper.error(e); LogHelper.error(e);
}
} }
} }
if (num != lastNum) lastNum = num;
} }
s.close(); s.close();
@ -89,9 +91,9 @@ private void checkVer() {
int patch = in.readInt(); int patch = in.readInt();
int build = in.readInt(); int build = in.readInt();
Version launcher = Launcher.getVersion(); Version launcher = Launcher.getVersion();
if (major > launcher.major || minor > launcher.minor || patch > launcher.patch || build > launcher.build) { if ((major > launcher.major || minor > launcher.minor || patch > launcher.patch || build > launcher.build) && in.readBoolean()) {
LogHelper.info("Updates avaliable download it from github."); LogHelper.info("Updates avaliable download it from github.");
LogHelper.info("New version: " + new Version(major, minor, patch, build).toString()); LogHelper.info("New version: " + new Version(major, minor, patch, build, Version.Type.valueOf(in.readString(128))).toString());
} }
s.close(); s.close();
} catch (IOException e) { } catch (IOException e) {

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/AuthHandler.java
View file

@ -6,7 +6,6 @@
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launchserver.auth.AuthException; import ru.gravit.launchserver.auth.AuthException;
import ru.gravit.launchserver.auth.provider.AuthProviderResult; import ru.gravit.launchserver.auth.provider.AuthProviderResult;
import ru.gravit.utils.helper.VerifyHelper; import ru.gravit.utils.helper.VerifyHelper;
@ -14,7 +13,6 @@
public abstract class AuthHandler implements AutoCloseable { public abstract class AuthHandler implements AutoCloseable {
private static final Map<String, Class<? extends AuthHandler>> AUTH_HANDLERS = new ConcurrentHashMap<>(4); private static final Map<String, Class<? extends AuthHandler>> AUTH_HANDLERS = new ConcurrentHashMap<>(4);
private static boolean registredHandl = false; private static boolean registredHandl = false;
private transient LaunchServer server = LaunchServer.server;
public static UUID authError(String message) throws AuthException { public static UUID authError(String message) throws AuthException {

2
modules

@ -1 +1 @@
Subproject commit ec1431605c4951ace5cbd2ab392b67cea25bddd5 Subproject commit e1e3b0d50bbb4a8ed5239df38690de69f92e2cc4