From fa22b0ec123c20e23b5c0f4ae1725d3a2696284a Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 1 Apr 2019 18:51:49 -0400 Subject: [PATCH] Removed dead donations code --- android/res/values/strings.xml | 6 ++++++ android/src/io/anuke/mindustry/AndroidLauncher.java | 13 ++----------- core/src/io/anuke/mindustry/core/Platform.java | 4 ---- 3 files changed, 8 insertions(+), 15 deletions(-) create mode 100644 android/res/values/strings.xml diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml new file mode 100644 index 0000000000..b77280e581 --- /dev/null +++ b/android/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + Mindustry + + \ No newline at end of file diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index 776237e4ec..b7f142e9f8 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -89,7 +89,7 @@ public class AndroidLauncher extends AndroidApplication{ if(checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED){ perms.add(Manifest.permission.READ_EXTERNAL_STORAGE); } - requestPermissions(perms.toArray(new String[perms.size()]), PERMISSION_REQUEST_CODE); + requestPermissions(perms.toArray(new String[0]), PERMISSION_REQUEST_CODE); } } @@ -183,17 +183,8 @@ public class AndroidLauncher extends AndroidApplication{ } } - private boolean isPackageInstalled(String packagename){ - try{ - getPackageManager().getPackageInfo(packagename, 0); - return true; - }catch(Exception e){ - return false; - } - } - private boolean isTablet(Context context){ TelephonyManager manager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); - return manager.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE; + return manager != null && manager.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE; } } diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java index 8dfb654d9b..e8eb0c550e 100644 --- a/core/src/io/anuke/mindustry/core/Platform.java +++ b/core/src/io/anuke/mindustry/core/Platform.java @@ -37,10 +37,6 @@ public abstract class Platform { } /**Update discord RPC.*/ public void updateRPC(){} - /**Open donation dialog. Currently android only.*/ - public void openDonations(){ - - } /**Whether donating is supported.*/ public boolean canDonate(){ return false;