miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: fixed SDL2 Java code

Browse Source
This commit is contained in:
Sergii Pylypenko
2022-01-09 18:56:58 +02:00
parent 8f8ea18517
commit 272fea83c2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
project/javaSDL2/MainActivity.java
View File

@@ -23,7 +23,9 @@ package net.sourceforge.clonekeenplus;
import android.app.Activity; import android.app.Activity;
import android.app.UiModeManager; import android.app.UiModeManager;
import android.app.AlertDialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
@@ -52,7 +54,7 @@ public class MainActivity extends org.libsdl.app.SDLActivity {
if (Settings.settingsLoaded) { if (Settings.settingsLoaded) {
Log.i("SDL", "libSDL: Settings.ProcessConfig(): loaded settings successfully"); Log.i("SDL", "libSDL: Settings.ProcessConfig(): loaded settings successfully");
Log.i("SDL", "libSDL: old app version " + settingsAppVersion + ", new app version " + this.getApplicationVersion()); Log.i("SDL", "libSDL: old app version " + Settings.settingsAppVersion + ", new app version " + this.getApplicationVersion());
if (Settings.settingsAppVersion != this.getApplicationVersion()) { if (Settings.settingsAppVersion != this.getApplicationVersion()) {
Settings.DeleteFilesOnUpgrade(this); Settings.DeleteFilesOnUpgrade(this);
if (Globals.ResetSdlConfigForThisVersion) { if (Globals.ResetSdlConfigForThisVersion) {
@@ -60,7 +62,7 @@ public class MainActivity extends org.libsdl.app.SDLActivity {
// Delete settings file, and restart the application // Delete settings file, and restart the application
Settings.DeleteSdlConfigOnUpgradeAndRestart(this); Settings.DeleteSdlConfigOnUpgradeAndRestart(this);
} }
Settings.Save(p); Settings.Save(this);
} }
} }
@@ -96,11 +98,11 @@ public class MainActivity extends org.libsdl.app.SDLActivity {
} }
public void downloadFinishedInitSDL() { public void downloadFinishedInitSDL() {
if (!this.dataDownloader.downloadCompete) if (!this.dataDownloader.DownloadComplete)
{ {
Log.i("SDL", "Data download failed!"); Log.i("SDL", "Data download failed!");
AlertDialog.Builder dlgAlert = new AlertDialog.Builder(this); AlertDialog.Builder dlgAlert = new AlertDialog.Builder(this);
dlgAlert.setMessage(res.getString(R.string.error_dl_from, Globals.DataDownloadUrl)); dlgAlert.setMessage(this.getResources().getString(R.string.error_dl_from, Globals.DataDownloadUrl));
dlgAlert.setTitle("SDL Error"); dlgAlert.setTitle("SDL Error");
dlgAlert.setPositiveButton("Exit", dlgAlert.setPositiveButton("Exit",
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {