Merge pull request #2609 from wmathurin/dev

Make sure to recreate dev actions for dev menu if front activity changes

Author: wmathurin

native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/ExplorerActivity.java

@@ -85,7 +85,6 @@ public class ExplorerActivity extends SalesforceActivity {
 	private RestClient client;
 	private TextView resultText;
     private TabHost tabHost;
-    private LogoutDialogFragment logoutConfirmationDialog;
 
 	// Use for objectId fields auto-complete.
 	private TreeSet<String> knownIds = new TreeSet<String>();
@@ -129,8 +128,6 @@ protected void onCreate(Bundle savedInstanceState) {
 		// Makes the result area scrollable.
 		resultText = (TextView) findViewById(R.id.result_text);
 		resultText.setMovementMethod(new ScrollingMovementMethod());
-        logoutConfirmationDialog = new LogoutDialogFragment();
-
 		((RestExplorerApp.RestExplorerSDKManager) RestExplorerApp.RestExplorerSDKManager.getInstance())
 				.addDevAction(this, "Export Credentials to Clipboard", this::exportCredentials);
 	}
@@ -140,15 +137,6 @@ public void onResume(RestClient client) {
 		this.client = client;
 	}
 
-	/**
-	 * Returns the logout dialog fragment (used mainly by tests).
-	 *
-	 * @return Logout dialog fragment.
-	 */
-	public LogoutDialogFragment getLogoutConfirmationDialog() {
-		return logoutConfirmationDialog;
-	}
-
 	private void addTab(String tag, int titleId, int tabId) {
 		tabHost.addTab(tabHost.newTabSpec(tag).setIndicator(getString(titleId))
 				.setContent(tabId));

native/NativeSampleApps/RestExplorer/src/com/salesforce/samples/restexplorer/LogoutDialogFragment.java

@@ -74,6 +74,7 @@ public void onCreate() {
 	}
 
 	static class RestExplorerSDKManager extends SalesforceSDKManager {
+		Activity frontActivityForDevActions;
 		Map<String, DevActionHandler> devActions;
 
 		/**
@@ -109,6 +110,11 @@ public static void initNative(
 		public Map<String, DevActionHandler> getDevActions(
 				@NonNull Activity frontActivity
 		) {
+			if (frontActivityForDevActions != frontActivity) {
+				devActions = null;
+				frontActivityForDevActions = frontActivity;
+			}
+
 			if (devActions == null) {
 				devActions = super.getDevActions(frontActivity);
 			}
@@ -117,11 +123,7 @@ public Map<String, DevActionHandler> getDevActions(
 		}
 
 		public void addDevAction(Activity frontActivity, String name, DevActionHandler handler) {
-			if (devActions == null) {
-				devActions = super.getDevActions(frontActivity);
-			}
-
-			devActions.put(name, handler);
+			getDevActions(frontActivity).put(name, handler);
 		}
 	}
 }