[[ Bug 22950 ]] Implement OnActivityResultListener

montegoulding · montegoulding · commit a134b6fd0c3d · 2021-02-10T14:22:51.000+11:00
This patch implements an `OnActivityResultListener` interface so it is possible to
handle `onActivityResult` for a particular result code.

This implementation should be icnsidered temporary until bug 19920 (EngineAPI class)
is implemented at which point `OnActivityResultListener` would likely become an
interface of `EngineAPI` rather than `LiveCodeActivity`.
diff --git a/engine/src/java/com/runrev/android/LiveCodeActivity.java b/engine/src/java/com/runrev/android/LiveCodeActivity.java
@@ -25,6 +25,7 @@
 import android.util.*;
 import android.content.pm.PackageManager;
 import android.graphics.*;
+import java.util.*;
 
 // This is the main activity exported by the application. This is
 // split into two parts, a customizable sub-class that gets dynamically
@@ -37,6 +38,8 @@ public class LiveCodeActivity extends Activity
 	public static FrameLayout s_main_layout;
 	public static Engine s_main_view;
 
+    private HashMap<Integer, OnActivityResultListener> m_activity_result_listeners;
+    
 	//////////
 
 	public LiveCodeActivity()
@@ -86,6 +89,9 @@ public void onGlobalLayout()
                 s_main_view.updateKeyboardVisible();
             }
         });
+        
+        m_activity_result_listeners = new HashMap<Integer, OnActivityResultListener>();
+        
 	}
 
 	@Override
@@ -203,11 +209,38 @@ else if (keyCode == KeyEvent.KEYCODE_SEARCH && event.getRepeatCount() == 0)
 
 ////////////////////////////////////////////////////////////////////////////////
 
+    public interface OnActivityResultListener
+    {
+        public void onActivityResult (int p_request_code, int p_result_code, Intent p_data);
+    }
+    
+    public void setOnActivityResultListener(OnActivityResultListener p_listener, int p_request_code)
+    {
+        Integer t_request_code = Integer.valueOf(p_request_code);
+        m_activity_result_listeners.put(t_request_code, p_listener);
+    }
+    
+    public void removeOnActivityResultListener(int p_request_code)
+    {
+        Integer t_request_code = Integer.valueOf(p_request_code);
+        m_activity_result_listeners.remove(t_request_code);
+    }
+    
 	// 
 	@Override
 	protected void onActivityResult (int requestCode, int resultCode, Intent data)
 	{
-		s_main_view.onActivityResult(requestCode, resultCode, data);
+        // activity resuult listeners override any engine request code handlers
+        Integer t_request_code = Integer.valueOf(requestCode);
+        OnActivityResultListener t_listener = m_activity_result_listeners.get(t_request_code);
+        if (t_listener != null)
+        {
+            t_listener.onActivityResult(requestCode, resultCode, data);
+        }
+        else
+        {
+            s_main_view.onActivityResult(requestCode, resultCode, data);
+        }
 	}
     
     // Callback sent when the app requests permissions on runtime (Android API 23+)
