Merge branch 'master' of https://github.com/dolphin-emu/dolphin

UWP-Team · Oct 18, 2017 · 39f6573 · 39f6573
2 parents d5eb2d5 + 774fca4
commit 39f6573
Show file tree

Hide file tree

Showing 32 changed files with 509 additions and 509 deletions.
diff --git a/Source/Android/app/build.gradle b/Source/Android/app/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.2'
 
     lintOptions {
         // This is important as it will run lint but not abort on error
@@ -71,7 +71,7 @@ android {
 }
 
 ext {
-    androidSupportVersion = '25.3.0'
+    androidSupportVersion = '26.1.0'
 }
 
 dependencies {

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -12,13 +12,15 @@
 import org.dolphinemu.dolphinemu.activities.EmulationActivity;
 import org.dolphinemu.dolphinemu.utils.Log;
 
+import java.lang.ref.WeakReference;
+
 /**
  * Class which contains methods that interact
  * with the native side of the Dolphin code.
  */
 public final class NativeLibrary
 {
-	public static EmulationActivity sEmulationActivity;
+	public static WeakReference<EmulationActivity> sEmulationActivity = new WeakReference<>(null);
 
 	/**
 	 * Button type for use in onTouchEvent
@@ -379,25 +381,34 @@ private NativeLibrary()
 	public static void displayAlertMsg(final String alert)
 	{
 		Log.error("[NativeLibrary] Alert: " + alert);
-		sEmulationActivity.runOnUiThread(new Runnable()
+		final EmulationActivity emulationActivity = sEmulationActivity.get();
+		if (emulationActivity != null)
 		{
-			@Override
-			public void run()
+			emulationActivity.runOnUiThread(new Runnable()
 			{
-				Toast.makeText(sEmulationActivity, "Panic Alert: " + alert, Toast.LENGTH_LONG).show();
-			}
-		});
+				@Override
+				public void run()
+				{
+					Toast.makeText(emulationActivity, "Panic Alert: " + alert, Toast.LENGTH_LONG).show();
+				}
+			});
+		}
+		else
+		{
+			Log.warning("[NativeLibrary] EmulationActivity is null, can't do panic toast.");
+		}
 	}
 
-	public static void endEmulationActivity()
+	public static void setEmulationActivity(EmulationActivity emulationActivity)
 	{
-		Log.verbose("[NativeLibrary]Ending EmulationActivity.");
-		sEmulationActivity.exitWithAnimation();
+		Log.verbose("[NativeLibrary] Registering EmulationActivity.");
+		sEmulationActivity = new WeakReference<>(emulationActivity);
 	}
 
-	public static void setEmulationActivity(EmulationActivity emulationActivity)
+	public static void clearEmulationActivity()
 	{
-		Log.verbose("[NativeLibrary]Registering EmulationActivity.");
-		sEmulationActivity = emulationActivity;
+		Log.verbose("[NativeLibrary] Unregistering EmulationActivity.");
+
+		sEmulationActivity.clear();
 	}
 }
diff --git a/.../Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AddDirectoryActivity.java b/.../Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AddDirectoryActivity.java
@@ -1,12 +1,12 @@
 package org.dolphinemu.dolphinemu.activities;
 
-import android.app.Activity;
 import android.content.AsyncQueryHandler;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -133,7 +133,7 @@ public void updateSubtitle(String path)
 		mToolbar.setSubtitle(path);
 	}
 
-	public static void launch(Activity activity)
+	public static void launch(FragmentActivity activity)
 	{
 		Intent fileChooser = new Intent(activity, AddDirectoryActivity.class);
 		activity.startActivityForResult(fileChooser, MainPresenter.REQUEST_ADD_DIRECTORY);