Merge pull request #47 from microbit-foundation/intent-error

Partially remove unused camera-related code

Author: martinwork

app/src/main/AndroidManifest.xml

@@ -147,12 +147,6 @@
             android:label="Audio Recorder"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"/>
-        <activity
-            android:name=".ui.activity.CameraActivity_OldAPI"
-            android:label="Camera Microbit"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"/>
         <activity
             android:name=".ui.activity.HelpWebView"
             android:configChanges="orientation|screenSize"
@@ -165,13 +159,6 @@
             android:label="MakeCode Webview"
             android:launchMode="singleTask"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
-
-        <activity
-            android:name=".ui.activity.CameraActivityPermissionChecker"
-            android:label="@string/title_activity_camera_activity_permission_checker"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme.NoActionBar"/>
-
         <service
             android:name=".service.DfuService"
             android:enabled="true"/>

app/src/main/java/com/samsung/microbit/data/constants/EventCategories.java

@@ -94,5 +94,4 @@ private EventCategories() {
      * @see EventSubCodes
      * @see com.samsung.microbit.utils.Utils#makeMicroBitValue(int, int) Utils.makeBicrobitValue(int, int)
      */
-    public static final int SAMSUNG_CAMERA_ID = 1002;//0x03EA
 }

app/src/main/java/com/samsung/microbit/data/constants/EventSubCodes.java

@@ -23,20 +23,6 @@ private EventSubCodes() {
     public static final int SAMSUNG_REMOTE_CONTROL_EVT_VOLUMEUP = 8;
     public static final int SAMSUNG_REMOTE_CONTROL_EVT_VOLUMEDOWN = 9;
 
-    /**
-     * Samsung remote control sub codes. Related to event Category {@link EventCategories#SAMSUNG_CAMERA_ID}
-     *
-     * @see com.samsung.microbit.utils.Utils#makeMicroBitValue(int, int) Utils.makeBicrobitValue(int, int)
-     */
-    public static final int SAMSUNG_CAMERA_EVT_LAUNCH_PHOTO_MODE = 1;
-    public static final int SAMSUNG_CAMERA_EVT_LAUNCH_VIDEO_MODE = 2;
-    public static final int SAMSUNG_CAMERA_EVT_TAKE_PHOTO = 3;
-    public static final int SAMSUNG_CAMERA_EVT_START_VIDEO_CAPTURE = 4;
-    public static final int SAMSUNG_CAMERA_EVT_STOP_VIDEO_CAPTURE = 5;
-    public static final int SAMSUNG_CAMERA_EVT_STOP_PHOTO_MODE = 6;
-    public static final int SAMSUNG_CAMERA_EVT_STOP_VIDEO_MODE = 7;
-    public static final int SAMSUNG_CAMERA_EVT_TOGGLE_FRONT_REAR = 8;
-
     /**
      * Samsung remote control sub codes. Related to event Category {@link EventCategories#SAMSUNG_AUDIO_RECORDER_ID}
      *

app/src/main/java/com/samsung/microbit/plugin/CameraPlugin.java

@@ -52,10 +52,6 @@ public AbstractPlugin createPlugin(int eventCategory, Handler serviceHandler) {
                 abstractPlugin = new AudioRecordPlugin();
                 break;
 
-            case EventCategories.SAMSUNG_CAMERA_ID:
-                abstractPlugin = new CameraPlugin();
-                break;
-
             case EventCategories.SAMSUNG_SIGNAL_STRENGTH_ID:
                 abstractPlugin = new InformationPlugin();
                 break;

app/src/main/java/com/samsung/microbit/plugin/PluginsCreator.java

@@ -629,8 +629,6 @@ private void register_AppRequirement(BluetoothGattService eventService, boolean
             */
             writeCharacteristic(GattServiceUUIDs.EVENT_SERVICE.toString(), CharacteristicUUIDs.ES_CLIENT_REQUIREMENTS.toString(),
                     EventCategories.SAMSUNG_REMOTE_CONTROL_ID, GattFormats.FORMAT_UINT32);
-            writeCharacteristic(GattServiceUUIDs.EVENT_SERVICE.toString(), CharacteristicUUIDs.ES_CLIENT_REQUIREMENTS.toString(),
-                    EventCategories.SAMSUNG_CAMERA_ID, GattFormats.FORMAT_UINT32);
             writeCharacteristic(GattServiceUUIDs.EVENT_SERVICE.toString(), CharacteristicUUIDs.ES_CLIENT_REQUIREMENTS.toString(),
                     EventCategories.SAMSUNG_ALERTS_ID, GattFormats.FORMAT_UINT32);
             writeCharacteristic(GattServiceUUIDs.EVENT_SERVICE.toString(), CharacteristicUUIDs.ES_CLIENT_REQUIREMENTS.toString(),
@@ -887,7 +885,6 @@ private void sendMessage(int eventSrc, int event) {
             case EventCategories.SAMSUNG_REMOTE_CONTROL_ID:
             case EventCategories.SAMSUNG_ALERTS_ID:
             case EventCategories.SAMSUNG_AUDIO_RECORDER_ID:
-            case EventCategories.SAMSUNG_CAMERA_ID:
                 msgService = eventSrc;
                 cmd = new CmdArg(event, "1000");
                 break;