From 2260e05c99afd217b59b38f6b76b597d7b2dcfdd Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Wed, 23 Dec 2020 16:03:00 +0700 Subject: [PATCH] Code changes\n- Rename com.kdt.mojangauth to net.kdt.pojavlaunch.authenticator.mojang\n- A compile fix --- .../main/java/net/kdt/pojavlaunch/MCProfile.java | 2 +- .../kdt/pojavlaunch/PojavLauncherActivity.java | 15 ++++++++++----- .../net/kdt/pojavlaunch/PojavLoginActivity.java | 3 +-- .../microsoft/MicrosoftAuthTask.java | 4 ++-- .../mojang}/InvalidateTokenTask.java | 4 ++-- .../authenticator/mojang}/LoginListener.java | 2 +- .../authenticator/mojang}/LoginTask.java | 4 ++-- .../authenticator/mojang}/RefreshListener.java | 2 +- .../authenticator/mojang}/RefreshTokenTask.java | 4 ++-- .../mojang}/yggdrasil/AuthenticateRequest.java | 2 +- .../mojang}/yggdrasil/AuthenticateResponse.java | 2 +- .../mojang}/yggdrasil/ErrorResponse.java | 2 +- .../mojang}/yggdrasil/NetworkResponse.java | 2 +- .../authenticator/mojang}/yggdrasil/Profile.java | 2 +- .../mojang}/yggdrasil/RefreshRequest.java | 2 +- .../mojang}/yggdrasil/RefreshResponse.java | 2 +- .../mojang}/yggdrasil/YggdrasilAuthenticator.java | 2 +- 17 files changed, 30 insertions(+), 26 deletions(-) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/InvalidateTokenTask.java (91%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/LoginListener.java (68%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/LoginTask.java (95%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/RefreshListener.java (79%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/RefreshTokenTask.java (95%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/yggdrasil/AuthenticateRequest.java (90%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/yggdrasil/AuthenticateResponse.java (76%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/yggdrasil/ErrorResponse.java (64%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/yggdrasil/NetworkResponse.java (90%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/yggdrasil/Profile.java (61%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/yggdrasil/RefreshRequest.java (81%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/yggdrasil/RefreshResponse.java (71%) rename app_pojavlauncher/src/main/java/{com/kdt/mojangauth => net/kdt/pojavlaunch/authenticator/mojang}/yggdrasil/YggdrasilAuthenticator.java (98%) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MCProfile.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MCProfile.java index 6e72e927d..7938c8821 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MCProfile.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MCProfile.java @@ -4,8 +4,8 @@ import android.app.*; import android.content.*; import android.util.*; import android.view.*; -import com.kdt.mojangauth.*; import java.io.*; +import net.kdt.pojavlaunch.authenticator.mojang.*; public class MCProfile { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java index e6845ef3a..bcea8ced8 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java @@ -71,7 +71,8 @@ public class PojavLauncherActivity extends BaseLauncherActivity viewPageAdapter.addFragment(new LauncherFragment(), R.drawable.ic_menu_news, getString(R.string.mcl_tab_news)); viewPageAdapter.addFragment(mConsoleView, R.drawable.ic_menu_java, getString(R.string.mcl_tab_console)); viewPageAdapter.addFragment(mCrashView, 0, getString(R.string.mcl_tab_crash)); - viewPageAdapter.addFragment(new LauncherPreferenceFragment(), R.drawable.ic_menu_settings, getString(R.string.mcl_option_settings)); + viewPageAdapter.addFragment(new LauncherPreferenceFragment(), R.drawable.ic_menu_settings, + getString(R.string.mcl_option_settings)); viewPager.setAdapter(viewPageAdapter); // tabLayout.setTabMode(VerticalTabLayout.MODE_SCROLLABLE); @@ -134,7 +135,8 @@ public class PojavLauncherActivity extends BaseLauncherActivity if (tempProfile != null && position == 0) { PojavProfile.setCurrentProfile(PojavLauncherActivity.this, tempProfile); } else { - PojavProfile.setCurrentProfile(PojavLauncherActivity.this, Tools.DIR_ACCOUNT_NEW + "/" + accountList.get(position + (tempProfile != null ? 1 : 0)) + ".json"); + PojavProfile.setCurrentProfile(PojavLauncherActivity.this, + Tools.DIR_ACCOUNT_NEW + "/" + accountList.get(position + (tempProfile != null ? 1 : 0)) + ".json"); } pickAccount(); } @@ -189,8 +191,10 @@ public class PojavLauncherActivity extends BaseLauncherActivity protected float updateWidthHeight() { float leftRightWidth = (float) CallbackBridge.windowWidth / 100f * 32f; float mPlayButtonWidth = CallbackBridge.windowWidth - leftRightWidth * 2f; - LinearLayout.LayoutParams leftRightParams = new LinearLayout.LayoutParams((int) leftRightWidth, (int) Tools.dpToPx(CallbackBridge.windowHeight / 9)); - LinearLayout.LayoutParams mPlayButtonParams = new LinearLayout.LayoutParams((int) mPlayButtonWidth, (int) Tools.dpToPx(CallbackBridge.windowHeight / 9)); + LinearLayout.LayoutParams leftRightParams = new LinearLayout.LayoutParams((int) leftRightWidth, + (int) Tools.dpToPx(CallbackBridge.windowHeight / 9)); + LinearLayout.LayoutParams mPlayButtonParams = new LinearLayout.LayoutParams((int) mPlayButtonWidth, + (int) Tools.dpToPx(CallbackBridge.windowHeight / 9)); leftView.setLayoutParams(leftRightParams); rightView.setLayoutParams(leftRightParams); mPlayButton.setLayoutParams(mPlayButtonParams); @@ -220,7 +224,8 @@ public class PojavLauncherActivity extends BaseLauncherActivity } public void statusIsLaunching(boolean isLaunching) { - LinearLayout.LayoutParams reparam = new LinearLayout.LayoutParams((int) updateWidthHeight(), LinearLayout.LayoutParams.WRAP_CONTENT); + LinearLayout.LayoutParams reparam = new LinearLayout.LayoutParams((int) updateWidthHeight(), + LinearLayout.LayoutParams.WRAP_CONTENT); ViewGroup.MarginLayoutParams lmainTabParam = (ViewGroup.MarginLayoutParams) fullTab.getLayoutParams(); int launchVisibility = isLaunching ? View.VISIBLE : View.GONE; mLaunchProgress.setVisibility(launchVisibility); diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index a823be14f..170b41d75 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -18,11 +18,11 @@ import android.util.*; import android.view.*; import android.widget.*; import android.widget.CompoundButton.*; -import com.kdt.mojangauth.*; import com.kdt.pickafile.*; import java.io.*; import java.util.*; import net.kdt.pojavlaunch.authenticator.microsoft.*; +import net.kdt.pojavlaunch.authenticator.mojang.*; import net.kdt.pojavlaunch.customcontrols.*; import net.kdt.pojavlaunch.prefs.*; import net.kdt.pojavlaunch.utils.*; @@ -688,7 +688,6 @@ public class PojavLoginActivity extends BaseActivity builder.setPositiveButton(android.R.string.cancel, null); builder.setTitle(this.getString(R.string.login_select_account)); - builder.setMessage(R.string.hint_select_account); builder.setSingleChoiceItems(listAdapter, 0, new DialogInterface.OnClickListener(){ @Override public void onClick(final DialogInterface di, final int selectedIndex) { diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthTask.java index 5ad91fff6..a5a8fdefb 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthTask.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/microsoft/MicrosoftAuthTask.java @@ -4,13 +4,13 @@ import android.app.*; import android.content.*; import android.os.*; import android.util.*; -import com.kdt.mojangauth.*; -import com.kdt.mojangauth.yggdrasil.*; import java.net.*; import java.text.*; import java.util.*; import net.kdt.pojavlaunch.*; +import net.kdt.pojavlaunch.authenticator.mojang.*; +import net.kdt.pojavlaunch.authenticator.microsoft.*; import org.json.*; import java.text.ParseException; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/InvalidateTokenTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java similarity index 91% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/InvalidateTokenTask.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java index c701873dd..dc266025f 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/InvalidateTokenTask.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/InvalidateTokenTask.java @@ -1,8 +1,8 @@ -package com.kdt.mojangauth; +package net.kdt.pojavlaunch.authenticator.mojang; import android.content.*; import android.os.*; -import com.kdt.mojangauth.yggdrasil.*; +import net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; import java.io.*; import java.util.*; import net.kdt.pojavlaunch.*; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/LoginListener.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginListener.java similarity index 68% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/LoginListener.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginListener.java index 129811f6e..444dffc6d 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/LoginListener.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginListener.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth; +package net.kdt.pojavlaunch.authenticator.mojang; public interface LoginListener { diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/LoginTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java similarity index 95% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/LoginTask.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java index 5d982671b..74e292cb3 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/LoginTask.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/LoginTask.java @@ -1,7 +1,7 @@ -package com.kdt.mojangauth; +package net.kdt.pojavlaunch.authenticator.mojang; import android.os.*; -import com.kdt.mojangauth.yggdrasil.*; +import net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; import java.io.*; import java.util.*; import net.kdt.pojavlaunch.*; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/RefreshListener.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshListener.java similarity index 79% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/RefreshListener.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshListener.java index db4cff17a..fd7794f53 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/RefreshListener.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshListener.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth; +package net.kdt.pojavlaunch.authenticator.mojang; import net.kdt.pojavlaunch.*; import net.kdt.pojavlaunch.value.*; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/RefreshTokenTask.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java similarity index 95% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/RefreshTokenTask.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java index 71407656f..209928975 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/RefreshTokenTask.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/RefreshTokenTask.java @@ -1,11 +1,11 @@ -package com.kdt.mojangauth; +package net.kdt.pojavlaunch.authenticator.mojang; import android.content.*; import android.os.*; import com.google.gson.*; import java.util.*; import net.kdt.pojavlaunch.*; -import com.kdt.mojangauth.yggdrasil.*; +import net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; import android.app.*; import net.kdt.pojavlaunch.value.*; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/AuthenticateRequest.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateRequest.java similarity index 90% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/AuthenticateRequest.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateRequest.java index 250ad6d26..339c38531 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/AuthenticateRequest.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateRequest.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth.yggdrasil; +package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; import java.util.UUID; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/AuthenticateResponse.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateResponse.java similarity index 76% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/AuthenticateResponse.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateResponse.java index fccd4790d..eff9448fc 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/AuthenticateResponse.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/AuthenticateResponse.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth.yggdrasil; +package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; import java.util.UUID; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/ErrorResponse.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/ErrorResponse.java similarity index 64% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/ErrorResponse.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/ErrorResponse.java index fabb353e9..e5718f0e8 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/ErrorResponse.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth.yggdrasil; +package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; public class ErrorResponse { public String cause; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/NetworkResponse.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/NetworkResponse.java similarity index 90% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/NetworkResponse.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/NetworkResponse.java index c60881139..e367343ad 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/NetworkResponse.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/NetworkResponse.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth.yggdrasil; +package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; import java.util.*; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/Profile.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/Profile.java similarity index 61% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/Profile.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/Profile.java index 44662e782..07e73fec9 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/Profile.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/Profile.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth.yggdrasil; +package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; public class Profile { public String id; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/RefreshRequest.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshRequest.java similarity index 81% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/RefreshRequest.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshRequest.java index dd633ca43..978d0e6e0 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/RefreshRequest.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshRequest.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth.yggdrasil; +package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; import java.util.UUID; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/RefreshResponse.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshResponse.java similarity index 71% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/RefreshResponse.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshResponse.java index 06eead068..4d36e5ab8 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/RefreshResponse.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/RefreshResponse.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth.yggdrasil; +package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; import java.util.UUID; diff --git a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/YggdrasilAuthenticator.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java similarity index 98% rename from app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/YggdrasilAuthenticator.java rename to app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java index b06196503..58575d6b1 100644 --- a/app_pojavlauncher/src/main/java/com/kdt/mojangauth/yggdrasil/YggdrasilAuthenticator.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/authenticator/mojang/yggdrasil/YggdrasilAuthenticator.java @@ -1,4 +1,4 @@ -package com.kdt.mojangauth.yggdrasil; +package net.kdt.pojavlaunch.authenticator.mojang.yggdrasil.*; import android.util.*; import java.io.*;