From d6543b4db08cf7dca71d67af42912ffd413cfc91 Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 16 Oct 2023 21:08:45 +0300 Subject: [PATCH] some kotlin translated classes --- app/src/main/java/com/ea/EAIO/EAIO.kt | 29 +- .../java/com/ea/EAMIO/StorageDirectory.kt | 47 ++- .../java/com/ea/easp/KeyboardAndroid.java | 1 - app/src/main/java/com/ea/easp/User.java | 7 - .../facebook/ExtendAccessTokenListener.java | 2 - .../ea/easp/facebook/FacebookAgentJNI.java | 348 ------------------ .../java/com/ea/ironmonkey/GameActivity.kt | 2 +- 7 files changed, 41 insertions(+), 395 deletions(-) delete mode 100644 app/src/main/java/com/ea/easp/User.java delete mode 100644 app/src/main/java/com/ea/easp/facebook/ExtendAccessTokenListener.java delete mode 100644 app/src/main/java/com/ea/easp/facebook/FacebookAgentJNI.java diff --git a/app/src/main/java/com/ea/EAIO/EAIO.kt b/app/src/main/java/com/ea/EAIO/EAIO.kt index a4489cd..b650a2e 100644 --- a/app/src/main/java/com/ea/EAIO/EAIO.kt +++ b/app/src/main/java/com/ea/EAIO/EAIO.kt @@ -1,15 +1,24 @@ -package com.ea.EAIO; +package com.ea.EAIO -import android.app.Activity; -import android.content.res.AssetManager; -import android.os.Environment; +import android.app.Activity +import android.content.res.AssetManager +import android.os.Environment -public class EAIO { - public static native void Shutdown(); - - public static void Startup(Activity activity) { - StartupNativeImpl(activity.getAssets(), Environment.getDataDirectory().getAbsolutePath(), activity.getFilesDir().getAbsolutePath(), Environment.getExternalStorageDirectory().getAbsolutePath()); +object EAIO { + external fun Shutdown() + fun Startup(activity: Activity) { + StartupNativeImpl( + activity.assets, + Environment.getDataDirectory().absolutePath, + activity.filesDir.absolutePath, + Environment.getExternalStorageDirectory().absolutePath + ) } - private static native void StartupNativeImpl(AssetManager assetManager, String dataDirectory, String filesDir, String externalStorage); + private external fun StartupNativeImpl( + assetManager: AssetManager, + dataDirectory: String, + filesDir: String, + externalStorage: String + ) } diff --git a/app/src/main/java/com/ea/EAMIO/StorageDirectory.kt b/app/src/main/java/com/ea/EAMIO/StorageDirectory.kt index cedbe5e..346488b 100644 --- a/app/src/main/java/com/ea/EAMIO/StorageDirectory.kt +++ b/app/src/main/java/com/ea/EAMIO/StorageDirectory.kt @@ -1,37 +1,32 @@ -package com.ea.EAMIO; +package com.ea.EAMIO -import android.app.Activity; -import android.os.Environment; +import android.annotation.SuppressLint +import android.app.Activity +import android.os.Environment +import android.util.Log +import com.ea.games.nfs13_na.BuildConfig -public class StorageDirectory { - public static Activity sActivity; - public static String GetDedicatedDirectory() { - return "Android/data/" + sActivity.getClass().getPackage().getName() + "/files/"; - } +object StorageDirectory { + @JvmStatic + fun GetDedicatedDirectory() = "" - public static String GetInternalStorageDirectory() { - return sActivity.getFilesDir().getAbsolutePath(); - } + @JvmStatic + fun GetInternalStorageDirectory() = "" - public static String GetPrimaryExternalStorageDirectory() { - return Environment.getExternalStorageDirectory().getAbsolutePath(); - } + @JvmStatic + fun GetPrimaryExternalStorageDirectory() = "" - public static String GetPrimaryExternalStorageState() { - return Environment.getExternalStorageState(); - } + @JvmStatic + fun GetPrimaryExternalStorageState() = "" - public static void Shutdown() { - ShutdownNativeImpl(); - } + @JvmStatic + fun Shutdown() = ShutdownNativeImpl() - private static native void ShutdownNativeImpl(); + private external fun ShutdownNativeImpl() - public static void Startup(Activity activity) { - sActivity = activity; - StartupNativeImpl(); - } + @JvmStatic + fun Startup() = StartupNativeImpl() - private static native void StartupNativeImpl(); + private external fun StartupNativeImpl() } diff --git a/app/src/main/java/com/ea/easp/KeyboardAndroid.java b/app/src/main/java/com/ea/easp/KeyboardAndroid.java index 7e0a71e..2d8585e 100644 --- a/app/src/main/java/com/ea/easp/KeyboardAndroid.java +++ b/app/src/main/java/com/ea/easp/KeyboardAndroid.java @@ -3,7 +3,6 @@ package com.ea.easp; import android.view.KeyEvent; import com.eamobile.Language; -/* access modifiers changed from: package-private */ public abstract class KeyboardAndroid { KeyboardAndroid() { } diff --git a/app/src/main/java/com/ea/easp/User.java b/app/src/main/java/com/ea/easp/User.java deleted file mode 100644 index 98ee8a5..0000000 --- a/app/src/main/java/com/ea/easp/User.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.ea.easp; - -public class User { - String mDisplayName; - String[] mEmail; - String[] mPhoneNumber; -} diff --git a/app/src/main/java/com/ea/easp/facebook/ExtendAccessTokenListener.java b/app/src/main/java/com/ea/easp/facebook/ExtendAccessTokenListener.java deleted file mode 100644 index 224d3f4..0000000 --- a/app/src/main/java/com/ea/easp/facebook/ExtendAccessTokenListener.java +++ /dev/null @@ -1,2 +0,0 @@ -package com.ea.easp.facebook;public interface ExtendAccessTokenListener { -} diff --git a/app/src/main/java/com/ea/easp/facebook/FacebookAgentJNI.java b/app/src/main/java/com/ea/easp/facebook/FacebookAgentJNI.java deleted file mode 100644 index 4dbda3b..0000000 --- a/app/src/main/java/com/ea/easp/facebook/FacebookAgentJNI.java +++ /dev/null @@ -1,348 +0,0 @@ -package com.ea.easp.facebook; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; - -import com.ea.easp.Debug; -import com.ea.easp.TaskLauncher; -import com.facebook.android.AsyncFacebookRunner; -import com.facebook.android.DialogError; -import com.facebook.android.Facebook; -import com.facebook.android.FacebookError; -import com.facebook.android.SessionEvents; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.MalformedURLException; - -public class FacebookAgentJNI { - private static final String kMODULE_TAG = "EASP jFBAgentJNI"; - private Activity mActivity; - private String mApplicationID; - private AsyncFacebookRunner mAsyncRunner; - private Facebook mFacebook; - private TaskLauncher mTaskLauncher; - - public class CommonDialogListener implements Facebook.DialogListener { - public CommonDialogListener() { - } - - @Override - public void onCancel() { - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(FacebookAgentJNI.this::onDialogCancel); - } - - @Override - public void onComplete(final Bundle parameters) { - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(() -> { - String[] strArr = new String[parameters.size()]; - String[] strArr2 = new String[parameters.size()]; - FacebookAgentJNI.convertBundlesStringKeyValueArray(parameters, strArr, strArr2); - FacebookAgentJNI.this.onDialogComplete(strArr, strArr2); - }); - } - - - @Override - public void onError(final DialogError dialogError) { - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(() -> FacebookAgentJNI.this.onDialogError(dialogError.getErrorCode(), dialogError.getFailingUrl(), dialogError.getMessage())); - } - - @Override // com.facebook.android.Facebook.DialogListener - public void onFacebookError(final FacebookError facebookError) { - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(() -> FacebookAgentJNI.this.onDialogFacebookError(facebookError.getErrorCode(), facebookError.getErrorType(), facebookError.getMessage())); - } - } - - private final class ExtendAccessTokenListener implements Facebook.ServiceListener, com.ea.easp.facebook.ExtendAccessTokenListener { - private ExtendAccessTokenListener() { - } - - @Override - public void onComplete(Bundle bundle) { - final String accessToken = bundle.getString("Facebook.ACCESS_TOKEN"); - final long accessTokenExpiresMS = bundle.getLong("Facebook.EXPIRES", 0); - Debug.Log.i(FacebookAgentJNI.kMODULE_TAG, "ExtendAccessTokenListener.onComplete(): bundle = " + bundle.toString()); - - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(new Runnable() { - @Override - public void run() { - FacebookAgentJNI.this.onExtendAccessTokenJNI(accessToken, accessTokenExpiresMS); - } - }); - } - - @Override // com.facebook.android.Facebook.ServiceListener - public void onError(Error error) { - Debug.Log.e(FacebookAgentJNI.kMODULE_TAG, "ExtendAccessTokenListener.onError(): e = " + error.toString()); - } - - @Override // com.facebook.android.Facebook.ServiceListener - public void onFacebookError(FacebookError facebookError) { - Debug.Log.e(FacebookAgentJNI.kMODULE_TAG, "ExtendAccessTokenListener.onFacebookError(): e = " + facebookError.toString()); - } - } - - private final class LoginDialogListener implements Facebook.DialogListener { - private LoginDialogListener() { - } - - @Override // com.facebook.android.Facebook.DialogListener - public void onCancel() { - SessionEvents.onLoginError("Action Canceled"); - } - - @Override // com.facebook.android.Facebook.DialogListener - public void onComplete(Bundle bundle) { - SessionEvents.onLoginSuccess(); - } - - @Override // com.facebook.android.Facebook.DialogListener - public void onError(DialogError dialogError) { - SessionEvents.onLoginError(dialogError.getMessage()); - } - - @Override // com.facebook.android.Facebook.DialogListener - public void onFacebookError(FacebookError facebookError) { - SessionEvents.onLoginError(facebookError.getMessage()); - } - } - - private class LogoutRequestListener implements AsyncFacebookRunner.RequestListener { - private LogoutRequestListener() { - } - - private final void onLogoutFinish() { - /* class com.ea.easp.facebook.FacebookAgentJNI.LogoutRequestListener.AnonymousClass1 */ - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(SessionEvents::onLogoutFinish); - } - - @Override // com.facebook.android.AsyncFacebookRunner.RequestListener - public void onComplete(String str, Object state) { - Debug.Log.i(FacebookAgentJNI.kMODULE_TAG, "LogoutRequestListener::onComplete()"); - onLogoutFinish(); - } - - @Override // com.facebook.android.BaseRequestListener, com.facebook.android.AsyncFacebookRunner.RequestListener - public void onFacebookError(FacebookError facebookError, Object state) { - Debug.Log.e(FacebookAgentJNI.kMODULE_TAG, "LogoutRequestListener::onFacebookError" + facebookError.getMessage()); - onLogoutFinish(); - } - - @Override // com.facebook.android.BaseRequestListener, com.facebook.android.AsyncFacebookRunner.RequestListener - public void onFileNotFoundException(FileNotFoundException fileNotFoundException, Object state) { - Debug.Log.e(FacebookAgentJNI.kMODULE_TAG, "LogoutRequestListener::onFileNotFoundException" + fileNotFoundException.getMessage()); - onLogoutFinish(); - } - - @Override // com.facebook.android.BaseRequestListener, com.facebook.android.AsyncFacebookRunner.RequestListener - public void onIOException(IOException iOException, Object state) { - Debug.Log.e(FacebookAgentJNI.kMODULE_TAG, "LogoutRequestListener::onIOException" + iOException.getMessage()); - onLogoutFinish(); - } - - @Override // com.facebook.android.BaseRequestListener, com.facebook.android.AsyncFacebookRunner.RequestListener - public void onMalformedURLException(MalformedURLException malformedURLException, Object state) { - Debug.Log.e(FacebookAgentJNI.kMODULE_TAG, "LogoutRequestListener::onMalformedURLException" + malformedURLException.getMessage()); - onLogoutFinish(); - } - - - } - - public class SampleAuthListener implements SessionEvents.AuthListener { - public SampleAuthListener() { - } - - @Override // com.facebook.android.SessionEvents.AuthListener - public void onAuthFail(final String mError) { - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(() -> FacebookAgentJNI.this.onAuthFailJNI(mError)); - } - - @Override // com.facebook.android.SessionEvents.AuthListener - public void onAuthSucceed() { - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(new Runnable() { - /* class com.ea.easp.facebook.FacebookAgentJNI.SampleAuthListener.AnonymousClass1 */ - - public void run() { - FacebookAgentJNI.this.onAuthSucceedJNI(FacebookAgentJNI.this.mFacebook.getAccessToken(), FacebookAgentJNI.this.mFacebook.getAccessExpires()); - } - }); - } - } - - public class SampleLogoutListener implements SessionEvents.LogoutListener { - public SampleLogoutListener() { - } - - @Override // com.facebook.android.SessionEvents.LogoutListener - public void onLogoutBegin() { - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(new Runnable() { - /* class com.ea.easp.facebook.FacebookAgentJNI.SampleLogoutListener.AnonymousClass1 */ - - public void run() { - FacebookAgentJNI.this.onLogoutBeginJNI(); - } - }); - } - - @Override // com.facebook.android.SessionEvents.LogoutListener - public void onLogoutFinish() { - FacebookAgentJNI.this.mTaskLauncher.runInGLThread(new Runnable() { - /* class com.ea.easp.facebook.FacebookAgentJNI.SampleLogoutListener.AnonymousClass2 */ - - public void run() { - FacebookAgentJNI.this.onLogoutFinishJNI(); - } - }); - } - } - - public FacebookAgentJNI(Activity activity, TaskLauncher taskLauncher) { - this.mActivity = activity; - this.mTaskLauncher = taskLauncher; - } - - /* access modifiers changed from: private */ - public static void convertBundlesStringKeyValueArray(Bundle bundle, String[] strArr, String[] strArr2) { - if (strArr == null || strArr2 == null) { - Debug.Log.e(kMODULE_TAG, "convertBundlesStringKeyValueArray(): bundleKeys and bundleValues must exist at this point."); - } else if (strArr.length == bundle.size() && strArr2.length == bundle.size()) { - int i = 0; - for (String str : bundle.keySet()) { - strArr[i] = str; - strArr2[i] = bundle.getString(str); - i++; - } - } else { - Debug.Log.e(kMODULE_TAG, "convertBundlesStringKeyValueArray(): bundleKeys and bundleValues must be empty."); - } - } - - private static Bundle convertStringKeyValueArrayToBundle(String[] strArr, String[] strArr2) { - Bundle bundle = new Bundle(); - if (strArr.length != strArr2.length) { - Debug.Log.e(kMODULE_TAG, "convertStringKeyValueArrayToBundle(): lengths of bundleKeys and bundleValues must be equal."); - } - for (int i = 0; i != strArr.length; i++) { - bundle.putString(strArr[i], strArr2[i]); - } - return bundle; - } - - public void authorizeCallback(int i, int i2, Intent intent) { - if (this.mFacebook != null) { - this.mFacebook.authorizeCallback(i, i2, intent); - } - } - - public void dialog(final String action, String[] strArr, String[] strArr2) { - - final Bundle parameters = convertStringKeyValueArrayToBundle(strArr, strArr2); - - this.mTaskLauncher.runInUIThread(new Runnable() { - - @Override - public void run() { - FacebookAgentJNI.this.initFacebookSDKIfNeeded(); - FacebookAgentJNI.this.mFacebook.dialog(FacebookAgentJNI.this.mActivity, action, parameters, new CommonDialogListener()); - } - }); - } - - public void extendAccessTokenIfNeeded() { - this.mTaskLauncher.runInUIThread(new Runnable() { - /* class com.ea.easp.facebook.FacebookAgentJNI.AnonymousClass1 */ - @Override - public void run() { - FacebookAgentJNI.this.initFacebookSDKIfNeeded(); - FacebookAgentJNI.this.mFacebook.extendAccessToken(FacebookAgentJNI.this.mActivity, new ExtendAccessTokenListener()); - } - }); - } - - public void facebookLogin(final String permissions) { - this.mTaskLauncher.runInUIThread(new Runnable() { - @Override - public void run() { - FacebookAgentJNI.this.initFacebookSDKIfNeeded(); - String[] split = permissions.split(","); - Debug.Log.i(FacebookAgentJNI.kMODULE_TAG, "request permissions:"); - for (int i = 0; i != split.length; i++) { - Debug.Log.i(FacebookAgentJNI.kMODULE_TAG, " " + split[i]); - } - FacebookAgentJNI.this.mFacebook.authorize(FacebookAgentJNI.this.mActivity, split, new LoginDialogListener()); - } - }); - } - - public void facebookLogout() { - this.mTaskLauncher.runInUIThread(new Runnable() { - @Override - public void run() { - if (FacebookAgentJNI.this.mAsyncRunner != null) { - FacebookAgentJNI.this.mAsyncRunner.logout(FacebookAgentJNI.this.mActivity, new LogoutRequestListener()); - } else { - Debug.Log.e(FacebookAgentJNI.kMODULE_TAG, "facebookLogout(): not logged in. Logout notification will not be sent."); - } - } - }); - } - - public void init() { - initJNI(); - } - - /* access modifiers changed from: package-private */ - public void initFacebookSDKIfNeeded() { - if (this.mFacebook == null) { - Debug.Log.d(kMODULE_TAG, "initFacebookSDKIfNeeded(): app id = " + this.mApplicationID); - this.mFacebook = new Facebook(this.mApplicationID); - this.mAsyncRunner = new AsyncFacebookRunner(this.mFacebook); - SessionEvents.addAuthListener(new SampleAuthListener()); - SessionEvents.addLogoutListener(new SampleLogoutListener()); - } - } - - public native void initJNI(); - - public native void onAuthFailJNI(String str); - - public native void onAuthSucceedJNI(String str, long j); - - public native void onDialogCancel(); - - public native void onDialogComplete(String[] strArr, String[] strArr2); - - public native void onDialogError(int i, String str, String str2); - - public native void onDialogFacebookError(int i, String str, String str2); - - public native void onExtendAccessTokenJNI(String str, long j); - - public native void onLogoutBeginJNI(); - - public native void onLogoutFinishJNI(); - - public void setAccessToken(final String accessToken, final long accessTokenExpiresMS) { - this.mTaskLauncher.runInUIThread(new Runnable() { - @Override - public void run() { - FacebookAgentJNI.this.initFacebookSDKIfNeeded(); - FacebookAgentJNI.this.mFacebook.setAccessToken(accessToken); - FacebookAgentJNI.this.mFacebook.setAccessExpires(accessTokenExpiresMS); - } - }); - } - - public void setApplicationID(String str) { - this.mApplicationID = str; - } - - public void shutdown() { - shutdownJNI(); - } - - public native void shutdownJNI(); -} diff --git a/app/src/main/java/com/ea/ironmonkey/GameActivity.kt b/app/src/main/java/com/ea/ironmonkey/GameActivity.kt index 4e57ffd..c76a84f 100644 --- a/app/src/main/java/com/ea/ironmonkey/GameActivity.kt +++ b/app/src/main/java/com/ea/ironmonkey/GameActivity.kt @@ -359,7 +359,7 @@ class GameActivity : ComponentActivity(), DrawFrameListener, IDeviceData, IDownl setContentView(mFrameLayout!!) Log.d(this.localClassName, "Init EAIO/EAMIO") EAIO.Startup(this) - StorageDirectory.Startup(this) + StorageDirectory.Startup() if (easpHandler == null) { Log.d(this.localClassName, "Init EASPHandler") easpHandler = EASPHandler(this, mFrameLayout!!, gameGLSurfaceView!!)