Upgrade for new vhack version & Bug fix

Fixed problems with white and blacklisting apps
Updated for the new vhack version

Author: itsfolf

build.gradle

@@ -20,8 +20,9 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.2'
     compile 'ch.qos.logback:logback-classic:1.2.3'
     compile 'com.google.guava:guava:24.0-jre'
-    compile 'net.olympiccode:vHackOSAPI-Java:v1.1-beta'
+    compile 'net.olympiccode:vHackOSAPI-Java:dev-SNAPSHOT'
+    compile 'io.sentry:sentry:1.7.1'
 }
 mainClassName = "net.olympiccode.vhackos.bot.core.vHackOSBot"
 shadowJar.destinationDir = file("/build/libs")
-shadowJar.archiveName = 'vHackOSAPI.jar'
+shadowJar.archiveName = 'vHackOSBot.jar'

src/main/java/net/olympiccode/vhackos/bot/core/updating/UpdateService.java

@@ -11,12 +11,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.security.UnresolvedPermission;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 public class UpdateService implements BotService {
 ScheduledExecutorService updateService;
@@ -78,11 +80,15 @@ public App getNextApp() {
     }
 
     public boolean isListed(AppType type) {
+        if (vHackOSBot.api.getStats().getLevel() < 2) {
+            LOG.info("Account level is lower than two, ignoring app listing.");
+            return true;
+        }
         switch (UpdateConfigValues.listMode) {
             case "whitelist":
                 return Arrays.asList(UpdateConfigValues.updateList).contains(type.getName()) || Arrays.asList(UpdateConfigValues.updateList).contains(type.getId());
             case "blacklist":
-                return !Arrays.asList(UpdateConfigValues.updateList).contains(type.getName()) || !Arrays.asList(UpdateConfigValues.updateList).contains(type.getId());
+                return !Arrays.stream(UpdateConfigValues.updateList).map(String::toLowerCase).collect(Collectors.toList()).contains(type.getName().toLowerCase()) && !Arrays.stream(UpdateConfigValues.updateList).map(String::toLowerCase).collect(Collectors.toList()).contains(String.valueOf(type.getId()));
         }
         return false;
     }

src/main/java/net/olympiccode/vhackos/bot/core/vHackOSBot.java

@@ -3,6 +3,7 @@
 import io.sentry.Sentry;
 import io.sentry.event.BreadcrumbBuilder;
 import io.sentry.event.UserBuilder;
+import net.olympiccode.vhackos.api.entities.impl.vHackOSAPIImpl;
 import net.olympiccode.vhackos.api.vHackOSAPI;
 import net.olympiccode.vhackos.api.vHackOSAPIBuilder;
 import net.olympiccode.vhackos.api.vHackOSInfo;
@@ -15,6 +16,9 @@
 import net.olympiccode.vhackos.bot.core.networking.NetworkingService;
 import net.olympiccode.vhackos.bot.core.updating.UpdateConfigValues;
 import net.olympiccode.vhackos.bot.core.updating.UpdateService;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -184,4 +188,18 @@ private String getProgressBar() {
         builder.append("] " + api.getStats().getLevelPorcentage() + "%");
         return builder.toString();
     }
+
+    public void checkForUpdates() {
+        //
+        //
+        Request request = (new Request.Builder()).url("https://api.github.com/repos/OlympicCode/vHackOSBot-Java/releases/latest").addHeader("user-agent", "Dalvik/1.6.0 (Linux; U; Android 4.4.4; SM-N935F Build/KTU84P)").addHeader("Accept-Encoding", "gzip").build();
+        try {
+            Response r = ((vHackOSAPIImpl) api).getRequester().getHttpClient().newCall(request).execute();
+            if (r.isSuccessful()) {
+                JSONObject json = new JSONObject(r.body());
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }