From a063605961c4be396b1783a1b9384ae17c66d94f Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Thu, 4 Feb 2021 14:19:52 +0100 Subject: [PATCH] - Removed a bunch of what seemed to be purely useless for any future puposes. --- .../main/java/com/kdt/mcgui/MineEditText.java | 3 -- .../java/com/kdt/pickafile/FileListView.java | 3 -- .../authenticator/microsoft/Msa.java | 24 ++------------ .../mojang/RefreshTokenTask.java | 3 -- .../fragments/ConsoleFragment.java | 33 +------------------ .../pojavlaunch/fragments/CrashFragment.java | 6 +--- .../installers/FabricInstaller.java | 8 +---- .../installers/LegacyOptifineInstaller.java | 8 +---- .../prefs/LauncherPreferences.java | 1 - .../pojavlaunch/value/MinecraftAccount.java | 2 -- 10 files changed, 6 insertions(+), 85 deletions(-) diff --git a/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineEditText.java b/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineEditText.java index be3eb89db..47e83cc9d 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineEditText.java +++ b/app_pojavlauncher/src/main/java/com/kdt/mcgui/MineEditText.java @@ -2,8 +2,6 @@ package com.kdt.mcgui; import android.content.*; import android.util.*; -import android.widget.*; -import net.kdt.pojavlaunch.*; import android.graphics.*; public class MineEditText extends com.google.android.material.textfield.TextInputEditText @@ -22,7 +20,6 @@ public class MineEditText extends com.google.android.material.textfield.TextInpu public void init() { - // setBackgroundResource(R.drawable.border_edittext); setBackgroundColor(Color.parseColor("#131313")); setPadding(5, 5, 5, 5); } diff --git a/app_pojavlauncher/src/main/java/com/kdt/pickafile/FileListView.java b/app_pojavlauncher/src/main/java/com/kdt/pickafile/FileListView.java index 2932f7c45..9677cce11 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/pickafile/FileListView.java +++ b/app_pojavlauncher/src/main/java/com/kdt/pickafile/FileListView.java @@ -62,8 +62,6 @@ public class FileListView extends LinearLayout mainLv = new ListView(context); - //listFileAt(Environment.getExternalStorageDirectory().getPath()); - mainLv.setOnItemClickListener(new OnItemClickListener(){ @Override public void onItemClick(AdapterView p1, View p2, int p3, long p4) @@ -110,7 +108,6 @@ public class FileListView extends LinearLayout File[] listFile = mainPath.listFiles(); FileListAdapter fileAdapter = new FileListAdapter(context); if(!path.equals(lockPath)){ - //fileAdapter.add(new File(path, "Path=\""+path+"\".noEquals(homePath=\""+homePath+"\")")); fileAdapter.add(new File(path, "..")); } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/Msa.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/Msa.java index 8f2502d59..0286fb5ce 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/Msa.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/Msa.java @@ -14,15 +14,6 @@ import org.json.*; public class Msa { - /* - private static final String loginUrl = "https://login.live.com/oauth20_authorize.srf" + - "?client_id=00000000402b5328" + - "&response_type=code" + - "&scope=service%3A%3Auser.auth.xboxlive.com%3A%3AMBI_SSL" + - "&redirect_uri=https%3A%2F%2Flogin.live.com%2Foauth20_desktop.srf"; - - private static final String redirectUrlSuffix = "https://login.live.com/oauth20_desktop.srf?code="; - */ private static final String authTokenUrl = "https://login.live.com/oauth20_token.srf"; private static final String xblAuthUrl = "https://user.auth.xboxlive.com/user/authenticate"; private static final String xstsAuthUrl = "https://xsts.auth.xboxlive.com/xsts/authorize"; @@ -49,7 +40,8 @@ public class Msa { URL url = new URL(authTokenUrl); Log.i("MicroAuth", "isRefresh=" + isRefresh + ", authCode= "+authcode); - Map data = new HashMap<>();/*Map.of( + Map data = new HashMap<>(); + /*Map.of( "client_id", "00000000402b5328", "code", authcode, "grant_type", "authorization_code", @@ -232,18 +224,6 @@ public class Msa { }else{ throwResponseError(conn); } - /* - HttpRequest request = HttpRequest.newBuilder(uri) - .header("Authorization", "Bearer " + mcAccessToken) - .GET().build(); - - HttpClient.newBuilder().build().sendAsync(request, HttpResponse.BodyHandlers.ofString()).thenAccept(resp -> { - if (resp.statusCode() >= 200 && resp.statusCode() < 300) { - String body = resp.body(); - Log.i("MicroAuth","store: " + body); - } - }); - */ } private void checkMcProfile(String mcAccessToken) throws IOException, JSONException { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java index 862baeca2..ffecd88ae 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java @@ -45,9 +45,6 @@ public class RefreshTokenTask extends AsyncTask { if (responseCode == 403) { RefreshResponse response = this.authenticator.refresh(profilePath.accessToken, UUID.fromString(profilePath.clientToken)); - // if (response == null) { - // throw new NullPointerException("Response is null?"); - // } if (response == null) { // Refresh when offline? return null; diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ConsoleFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ConsoleFragment.java index 439ec931b..df917a536 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ConsoleFragment.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/ConsoleFragment.java @@ -3,7 +3,6 @@ package net.kdt.pojavlaunch.fragments; import android.os.*; import androidx.annotation.Nullable; -import androidx.core.app.*; import android.view.*; import android.widget.*; @@ -27,37 +26,7 @@ public class ConsoleFragment extends Fragment return view; } - - @Override - public void onActivityCreated(Bundle p1) - { - super.onActivityCreated(p1); - /* - new Thread(new Runnable(){ - @Override - public void run() - { - while (true) { - try { - Thread.sleep(100); - } catch (InterruptedException e) {} - - final String popLog = ConsoleFragmentHelper.popLog(); - if (!popLog.isEmpty()) { - getActivity().runOnUiThread(new Runnable(){ - @Override - public void run() - { - consoleView.append(popLog); - System.out.println("OKAY? " + popLog); - } - }); - } - } - } - }).start(); - */ - } + @Override public void onResume() diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/CrashFragment.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/CrashFragment.java index 63065141f..4ad687bfc 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/CrashFragment.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/fragments/CrashFragment.java @@ -3,15 +3,12 @@ package net.kdt.pojavlaunch.fragments; import android.os.*; import androidx.annotation.Nullable; -import androidx.core.app.*; import android.view.*; import android.widget.*; import java.io.*; import net.kdt.pojavlaunch.*; import android.graphics.*; - -import androidx.core.os.*; import androidx.fragment.app.Fragment; public class CrashFragment extends Fragment @@ -43,8 +40,7 @@ public class CrashFragment extends Fragment crashView = (TextView) getView().findViewById(R.id.lmaintabconsoleLogCrashTextView); crashView.setTypeface(Typeface.MONOSPACE); crashView.setHint(this.getText(R.string.main_nocrash)); - - //new File(crashPath).mkdirs(); + } @Override diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java index a34e7adca..a7c6f31f1 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java @@ -1,14 +1,8 @@ package net.kdt.pojavlaunch.installers; -import android.content.*; + import java.io.*; -import java.util.jar.*; import net.kdt.pojavlaunch.*; -import java.nio.charset.*; -import net.kdt.pojavlaunch.value.*; -import org.apache.commons.io.*; -import com.google.gson.*; -import java.util.zip.*; public class FabricInstaller extends BaseInstaller { public FabricInstaller(BaseInstaller i) { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java index ced61373d..bfebcfeb2 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java @@ -1,14 +1,8 @@ package net.kdt.pojavlaunch.installers; -import android.content.*; + import java.io.*; -import java.util.jar.*; import net.kdt.pojavlaunch.*; -import java.nio.charset.*; -import net.kdt.pojavlaunch.value.*; -import org.apache.commons.io.*; -import com.google.gson.*; -import java.util.zip.*; public class LegacyOptifineInstaller extends BaseInstaller { public LegacyOptifineInstaller(BaseInstaller i) { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java index 46c5e3b57..e1682d0c1 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/prefs/LauncherPreferences.java @@ -1,7 +1,6 @@ package net.kdt.pojavlaunch.prefs; import android.content.*; -import java.util.*; import net.kdt.pojavlaunch.*; public class LauncherPreferences diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java index 43e33a03e..7469c5b4b 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/value/MinecraftAccount.java @@ -4,9 +4,7 @@ import android.util.Log; import net.kdt.pojavlaunch.*; import java.io.*; import com.google.gson.*; -import android.os.Environment; import android.graphics.Bitmap; -import android.graphics.BitmapFactory; import android.util.Base64; public class MinecraftAccount