External activity failure - tidy up

Author: martinwork

app/src/main/java/com/samsung/microbit/ui/FetchPopups.java

@@ -63,12 +63,6 @@ public void bluetoothEnableRestricted() {
         UIUtils.safelyStartActivityToast( mClient.fetchPopupsContext(),
                 mClient.fetchPopupsContext().getString(R.string.unable_to_start_activity_to_enable_bluetooth));
         mClient.fetchPopupsCancelled();
-//        PopUp.show( mClient.fetchPopupsContext().getString(R.string.this_device_may_have_restrictions_in_place), //message
-//                mClient.fetchPopupsContext().getString(R.string.unable_to_start_activity_to_enable_bluetooth),
-//                R.drawable.error_face, R.drawable.red_btn,
-//                PopUp.GIFF_ANIMATION_ERROR,
-//                PopUp.TYPE_ALERT,
-//                popupClickActivityCancelled, popupClickActivityCancelled);
     }
 
     public void bluetoothConnectPermissionError() {

app/src/main/java/com/samsung/microbit/ui/UIUtils.java

@@ -279,28 +279,6 @@ public void gifAnimate( @IdRes int id) {
         }
     }
 
-//    public static void safelyStartActivityPopup( Context context, String message, String title) {
-//        PopUp.show( message, title,
-//                R.drawable.error_face,
-//                R.drawable.red_btn,
-//                PopUp.GIFF_ANIMATION_ERROR,
-//                PopUp.TYPE_ALERT,
-//                null,
-//                null);
-//    }
-//
-//    public static void safelyStartActivityPopup( Context context, String title) {
-//        safelyStartActivityPopup( context, context.getString(R.string.this_device_may_have_restrictions_in_place), title);
-//    }
-//
-//    public static void safelyStartActivityPopupGeneric( Context context) {
-//        safelyStartActivityPopup( context, context.getString(R.string.unable_to_start_activity));
-//    }
-//
-//    public static void safelyStartActivityPopupOpenLink( Context context) {
-//        safelyStartActivityPopup( context, context.getString(R.string.unable_to_open_link));
-//    }
-
     public static void safelyStartActivityToast( Context context, String message, String title) {
         Toast.makeText( context, title + ".\n" + message, Toast.LENGTH_LONG).show();
     }
@@ -320,7 +298,6 @@ public static void safelyStartActivityToastOpenLink( Context context) {
 //    public static boolean safelyStartActivityDebugFail = false;
 
     // Wrap startActivity and startActivityForResult
-    // Call resolveActivity and catch exception from startActivity
     // Return non-zero error on fail
     // When startActivityForResult fails, the caller likely
     // needs to add code similar to the cancel case in onActivityResult
@@ -334,14 +311,6 @@ public static int safelyStartActivity( Context context, boolean report, Intent i
 //        }
 
         int error = 0;
-        ComponentName componentName = intent.resolveActivity( context.getPackageManager());
-        if ( componentName == null) {
-            /* TODO: Why is componentName null for
-                    ACTION_CREATE_DOCUMENT (unless createChooser is used)
-                    ACTION_VIEW?
-            */
-            Log.i(TAG,"startActivity - no component");
-        }
 
         try {
             if ( forResult) {

app/src/main/java/com/samsung/microbit/ui/activity/PairingActivity.java

@@ -1207,12 +1207,6 @@ private void enableBluetooth() {
             setActivityState(PairingActivityState.STATE_IDLE);
             UIUtils.safelyStartActivityToast( this, getString(R.string.unable_to_start_activity_to_enable_bluetooth));
             onFinish( RESULT_CANCELED);
-//            PopUp.show( getString(R.string.this_device_may_have_restrictions_in_place), //message
-//                    getString(R.string.unable_to_start_activity_to_enable_bluetooth),
-//                    R.drawable.error_face, R.drawable.red_btn,
-//                    PopUp.GIFF_ANIMATION_ERROR,
-//                    PopUp.TYPE_ALERT,
-//                    failedPermissionHandler, failedPermissionHandler);
         }
     }
 
@@ -1260,12 +1254,6 @@ public void popupLocationRestricted() {
         UIUtils.safelyStartActivityToast( this,
                 getString(R.string.unable_to_start_activity_to_enable_location_services));
         onFinish( RESULT_CANCELED);
-//        PopUp.show( getString(R.string.this_device_may_have_restrictions_in_place), //message
-//                getString(R.string.unable_to_start_activity_to_enable_location_services),
-//                R.drawable.error_face, R.drawable.red_btn,
-//                PopUp.GIFF_ANIMATION_ERROR,
-//                PopUp.TYPE_ALERT,
-//                failedPermissionHandler, failedPermissionHandler);
     }
 
     @Override

app/src/main/java/com/samsung/microbit/ui/activity/ProjectActivity.java

@@ -1090,12 +1090,6 @@ private void enableBluetooth() {
             UIUtils.safelyStartActivityToast( this,
                     getString(R.string.unable_to_start_activity_to_enable_bluetooth));
             onFlashComplete();
-//            PopUp.show( getString(R.string.this_device_may_have_restrictions_in_place), //message
-//                    getString(R.string.unable_to_start_activity_to_enable_bluetooth),
-//                    R.drawable.error_face, R.drawable.red_btn,
-//                    PopUp.GIFF_ANIMATION_ERROR,
-//                    TYPE_ALERT,
-//                    popupClickFlashComplete, popupClickFlashComplete);
         }
     }