From 906a7cc00b71b7cf14d92c736bb6efcf35a46391 Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Tue, 23 Jan 2018 15:28:20 +0100 Subject: [PATCH] Cleaned up formatting of Java code --- .../org/love2d/android/DownloadActivity.java | 20 +- .../org/love2d/android/DownloadService.java | 60 ++-- .../java/org/love2d/android/GameActivity.java | 324 +++++++++--------- 3 files changed, 203 insertions(+), 201 deletions(-) diff --git a/love/src/main/java/org/love2d/android/DownloadActivity.java b/love/src/main/java/org/love2d/android/DownloadActivity.java index 6a65c753..44dd7715 100644 --- a/love/src/main/java/org/love2d/android/DownloadActivity.java +++ b/love/src/main/java/org/love2d/android/DownloadActivity.java @@ -8,17 +8,17 @@ import android.os.Bundle; public class DownloadActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + super.onCreate(savedInstanceState); - Uri uri = this.getIntent().getData(); + Uri uri = this.getIntent().getData(); - if (uri.getScheme().equals("http")) { - String url = uri.toString(); - Intent intent = new Intent(this, DownloadService.class); - intent.putExtra("url", url); - startService(intent); - }; + if (uri.getScheme().equals("http")) { + String url = uri.toString(); + Intent intent = new Intent(this, DownloadService.class); + intent.putExtra("url", url); + startService(intent); + } - finish(); + finish(); } - } +} diff --git a/love/src/main/java/org/love2d/android/DownloadService.java b/love/src/main/java/org/love2d/android/DownloadService.java index 8bfd3fa4..aee4961f 100644 --- a/love/src/main/java/org/love2d/android/DownloadService.java +++ b/love/src/main/java/org/love2d/android/DownloadService.java @@ -22,14 +22,14 @@ public class DownloadService extends IntentService { @Override public void onDestroy() { - Log.d("DownloadService", "destroying"); - unregisterReceiver(downloadReceiver); + Log.d("DownloadService", "destroying"); + unregisterReceiver(downloadReceiver); } - + @Override protected void onHandleIntent(Intent intent) { - Log.d ("DownloadService", "service started"); - + Log.d("DownloadService", "service started"); + String url = intent.getStringExtra("url"); Uri uri = Uri.parse(url); @@ -38,26 +38,26 @@ public class DownloadService extends IntentService { DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url)); request.setDescription("LÖVE Game Download"); request.setTitle(uri.getLastPathSegment()); - request.setMimeType ("application/x-love-game"); - - // in order for this if to run, you must use the android 3.2 to compile your app - if (Build.VERSION.SDK_INT >= 11) { - DownloadRequestSettings_API11 settings = new DownloadRequestSettings_API11(); - settings.setup (request); - } - request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, uri.getLastPathSegment()); + request.setMimeType("application/x-love-game"); + + // in order for this if to run, you must use the android 3.2 to compile your app + if (Build.VERSION.SDK_INT >= 11) { + DownloadRequestSettings_API11 settings = new DownloadRequestSettings_API11(); + settings.setup(request); + } + request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, uri.getLastPathSegment()); // get download service and enqueue file Log.d("DownloadActivity", "creating manager"); DownloadManager manager = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE); Log.d("DownloadActivity", "enqueuing download"); - manager.enqueue(request); + manager.enqueue(request); - Log.d("DownloadActivity", "download receiver = " + downloadReceiver); - IntentFilter intentFilter = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE); - registerReceiver(downloadReceiver, intentFilter); + Log.d("DownloadActivity", "download receiver = " + downloadReceiver); + IntentFilter intentFilter = new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE); + registerReceiver(downloadReceiver, intentFilter); } - + /** * @param context used to check the device version and DownloadManager information * @return true if the download manager is available @@ -74,23 +74,23 @@ public class DownloadService extends IntentService { PackageManager.MATCH_DEFAULT_ONLY); return list.size() > 0; } catch (Exception e) { - return false; + return false; } } - + private BroadcastReceiver downloadReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - Log.d("DownloadActivity", "downloadReceiver intent called"); - - } - }; + @Override + public void onReceive(Context context, Intent intent) { + Log.d("DownloadActivity", "downloadReceiver intent called"); + + } + }; } class DownloadRequestSettings_API11 { - public static void setup (DownloadManager.Request request) { - request.allowScanningByMediaScanner(); - request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); - } + public static void setup(DownloadManager.Request request) { + request.allowScanningByMediaScanner(); + request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED); + } } diff --git a/love/src/main/java/org/love2d/android/GameActivity.java b/love/src/main/java/org/love2d/android/GameActivity.java index 241c7983..cd2471ad 100644 --- a/love/src/main/java/org/love2d/android/GameActivity.java +++ b/love/src/main/java/org/love2d/android/GameActivity.java @@ -45,215 +45,217 @@ public class GameActivity extends SDLActivity { private static Vibrator vibrator = null; private static boolean immersiveActive = false; private static boolean mustCacheArchive = false; - @Override - protected String[] getLibraries() { - return new String[] { - "gnustl_shared", - "mpg123", - "openal", - "love", - }; - } + + @Override + protected String[] getLibraries() { + return new String[]{ + "gnustl_shared", + "mpg123", + "openal", + "love", + }; + } @Override protected void onCreate(Bundle savedInstanceState) { - Log.d("GameActivity", "started"); - - context = this.getApplicationContext(); - - String permission = "android.permission.VIBRATE"; - int res = context.checkCallingOrSelfPermission(permission); - if (res == PackageManager.PERMISSION_GRANTED) { - vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE); - } else { - Log.d("GameActivity", "Vibration disabled: could not get vibration permission."); - } + Log.d("GameActivity", "started"); - handleIntent (this.getIntent()); + context = this.getApplicationContext(); - super.onCreate(savedInstanceState); - getWindowManager().getDefaultDisplay().getMetrics(metrics); + String permission = "android.permission.VIBRATE"; + int res = context.checkCallingOrSelfPermission(permission); + if (res == PackageManager.PERMISSION_GRANTED) { + vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE); + } else { + Log.d("GameActivity", "Vibration disabled: could not get vibration permission."); + } + + handleIntent(this.getIntent()); + + super.onCreate(savedInstanceState); + getWindowManager().getDefaultDisplay().getMetrics(metrics); } @Override - protected void onNewIntent (Intent intent) { - Log.d("GameActivity", "onNewIntent() with " + intent); - handleIntent (intent); - resetNative(); - startNative(); + protected void onNewIntent(Intent intent) { + Log.d("GameActivity", "onNewIntent() with " + intent); + handleIntent(intent); + resetNative(); + startNative(); } - protected void handleIntent (Intent intent) { - Uri game = intent.getData(); + protected void handleIntent(Intent intent) { + Uri game = intent.getData(); - if (game != null) { - // If we have a game via the intent data we we try to figure out how we have to load it. We - // support the following variations: - // * a main.lua file: set gamePath to the directory containing main.lua - // * otherwise: set gamePath to the file - if (game.getScheme().equals ("file")) { - Log.d("GameActivity", "Received intent with path: " + game.getPath()); - // If we were given the path of a main.lua then use its - // directory. Otherwise use full path. - List path_segments = game.getPathSegments(); - if (path_segments.get(path_segments.size() - 1).equals("main.lua")) { - gamePath = game.getPath().substring(0, game.getPath().length() - "main.lua".length()); - } else { - gamePath = game.getPath(); - } + if (game != null) { + // If we have a game via the intent data we we try to figure out how we have to load it. We + // support the following variations: + // * a main.lua file: set gamePath to the directory containing main.lua + // * otherwise: set gamePath to the file + if (game.getScheme().equals("file")) { + Log.d("GameActivity", "Received intent with path: " + game.getPath()); + // If we were given the path of a main.lua then use its + // directory. Otherwise use full path. + List path_segments = game.getPathSegments(); + if (path_segments.get(path_segments.size() - 1).equals("main.lua")) { + gamePath = game.getPath().substring(0, game.getPath().length() - "main.lua".length()); + } else { + gamePath = game.getPath(); + } + } else { + Log.e("GameActivity", "Unsupported scheme: '" + game.getScheme() + "'."); + + AlertDialog.Builder alert_dialog = new AlertDialog.Builder(this); + alert_dialog.setMessage("Could not load LÖVE game '" + game.getPath() + + "' as it uses unsupported scheme '" + game.getScheme() + + "'. Please contact the developer."); + alert_dialog.setTitle("LÖVE for Android Error"); + alert_dialog.setPositiveButton("Exit", + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + finish(); + } + }); + alert_dialog.setCancelable(false); + alert_dialog.create().show(); + } } else { - Log.e("GameActivity", "Unsupported scheme: '" + game.getScheme() + "'."); + // No game specified via the intent data -> check whether we have a game.love in our assets. + boolean game_love_in_assets = false; + try { + List assets = Arrays.asList(getAssets().list("")); + game_love_in_assets = assets.contains("game.love"); + } catch (Exception e) { + Log.d("GameActivity", "could not list application assets:" + e.getMessage()); + } - AlertDialog.Builder alert_dialog = new AlertDialog.Builder(this); - alert_dialog.setMessage("Could not load LÖVE game '" + game.getPath() - + "' as it uses unsupported scheme '" + game.getScheme() - + "'. Please contact the developer."); - alert_dialog.setTitle("LÖVE for Android Error"); - alert_dialog.setPositiveButton("Exit", - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog,int id) { - finish(); - } - }); - alert_dialog.setCancelable(false); - alert_dialog.create().show(); + if (game_love_in_assets) { + // If we have a game.love in our assets folder copy it to the cache folder + // so that we can load it from native LÖVE code + String destination_file = this.getCacheDir().getPath() + "/game.love"; + if (mustCacheArchive && copyAssetFile("game.love", destination_file)) + gamePath = destination_file; + else + gamePath = "game.love"; + } else { + // If no game.love was found fall back to the game in /lovegame + File ext = Environment.getExternalStorageDirectory(); + if ((new File(ext, "/lovegame/main.lua")).exists()) { + gamePath = ext.getPath() + "/lovegame/"; + } + } } - } else { - // No game specified via the intent data -> check whether we have a game.love in our assets. - boolean game_love_in_assets = false; - try { - List assets = Arrays.asList(getAssets().list("")); - game_love_in_assets = assets.contains("game.love"); - } catch (Exception e) { - Log.d("GameActivity", "could not list application assets:" + e.getMessage()); - } - if (game_love_in_assets) { - // If we have a game.love in our assets folder copy it to the cache folder - // so that we can load it from native LÖVE code - String destination_file = this.getCacheDir().getPath()+"/game.love"; - if (mustCacheArchive && copyAssetFile("game.love", destination_file)) - gamePath = destination_file; - else - gamePath = "game.love"; - } else { - // If no game.love was found fall back to the game in /lovegame - File ext = Environment.getExternalStorageDirectory(); - if ((new File(ext,"/lovegame/main.lua")).exists()) { - gamePath = ext.getPath() + "/lovegame/"; - } - } - } - - Log.d("GameActivity", "new gamePath: " + gamePath); + Log.d("GameActivity", "new gamePath: " + gamePath); } @Override protected void onDestroy() { - if (vibrator != null) { - Log.d("GameActivity", "Cancelling vibration"); - vibrator.cancel(); - } - super.onDestroy(); + if (vibrator != null) { + Log.d("GameActivity", "Cancelling vibration"); + vibrator.cancel(); + } + super.onDestroy(); } @Override protected void onPause() { - if (vibrator != null) { - Log.d("GameActivity", "Cancelling vibration"); - vibrator.cancel(); - } - super.onPause(); + if (vibrator != null) { + Log.d("GameActivity", "Cancelling vibration"); + vibrator.cancel(); + } + super.onPause(); } @Override public void onResume() { - super.onResume(); + super.onResume(); - if (immersiveActive) { - getWindow().getDecorView().setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); - } + if (immersiveActive) { + getWindow().getDecorView().setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); + } } - public void setImmersiveMode (boolean immersive_mode) { - if (android.os.Build.VERSION.SDK_INT < 11) { - // The API getWindow().getDecorView().setSystemUiVisibility() was - // added in Android 11 (a.k.a. Honeycomb, a.k.a. 3.0.x). If we run - // on this we do nothing. - return; - } + public void setImmersiveMode(boolean immersive_mode) { + if (android.os.Build.VERSION.SDK_INT < 11) { + // The API getWindow().getDecorView().setSystemUiVisibility() was + // added in Android 11 (a.k.a. Honeycomb, a.k.a. 3.0.x). If we run + // on this we do nothing. + return; + } - immersiveActive = immersive_mode; + immersiveActive = immersive_mode; - final Object lock = new Object(); - final boolean immersive_enabled = immersive_mode; - synchronized (lock) { - runOnUiThread (new Runnable() { - @Override - public void run() { - synchronized (lock) { - if (immersive_enabled) { - getWindow().getDecorView().setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); - } else { - getWindow().getDecorView().setSystemUiVisibility( - View.SYSTEM_UI_FLAG_LAYOUT_STABLE - | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - ); - } + final Object lock = new Object(); + final boolean immersive_enabled = immersive_mode; + synchronized (lock) { + runOnUiThread(new Runnable() { + @Override + public void run() { + synchronized (lock) { + if (immersive_enabled) { + getWindow().getDecorView().setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); + } else { + getWindow().getDecorView().setSystemUiVisibility( + View.SYSTEM_UI_FLAG_LAYOUT_STABLE + | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN + ); + } - lock.notify(); - } - } - }); - }; + lock.notify(); + } + } + }); + } + ; } - public boolean getImmersiveMode () { - return immersiveActive; + public boolean getImmersiveMode() { + return immersiveActive; } public static String getGamePath() { - Log.d ("GameActivity", "called getGamePath(), game path = " + gamePath); - return gamePath; + Log.d("GameActivity", "called getGamePath(), game path = " + gamePath); + return gamePath; } public static DisplayMetrics getMetrics() { return metrics; } - public static void vibrate (double seconds) { - if (vibrator != null) { - vibrator.vibrate((long) (seconds * 1000.)); - } + public static void vibrate(double seconds) { + if (vibrator != null) { + vibrator.vibrate((long) (seconds * 1000.)); + } } - public static void openURL (String url) { - Log.d ("GameActivity", "opening url = " + url); - Intent i = new Intent(Intent.ACTION_VIEW); - i.setData(Uri.parse(url)); - i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(i); + public static void openURL(String url) { + Log.d("GameActivity", "opening url = " + url); + Intent i = new Intent(Intent.ACTION_VIEW); + i.setData(Uri.parse(url)); + i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(i); } /** * Copies a given file from the assets folder to the destination. + * * @return true if successful */ - boolean copyAssetFile(String fileName, String destinationFileName) - { + boolean copyAssetFile(String fileName, String destinationFileName) { boolean success = false; // open source and destination streams @@ -268,7 +270,7 @@ public class GameActivity extends SDLActivity { try { destination_stream = new BufferedOutputStream(new FileOutputStream(destinationFileName, false)); } catch (IOException e) { - Log.d ("GameActivity", "Could not open destination file: " + e.getMessage()); + Log.d("GameActivity", "Could not open destination file: " + e.getMessage()); } // perform the copying @@ -295,7 +297,7 @@ public class GameActivity extends SDLActivity { if (destination_stream != null) destination_stream.close(); success = true; } catch (IOException e) { - Log.d ("GameActivity", "Copying failed: " + e.getMessage()); + Log.d("GameActivity", "Copying failed: " + e.getMessage()); } Log.d("GameActivity", "Successfully copied " + fileName @@ -306,7 +308,7 @@ public class GameActivity extends SDLActivity { @Keep public boolean hasBackgroundMusic() { - AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); - return audioManager.isMusicActive(); + AudioManager audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); + return audioManager.isMusicActive(); } }