Handle storage permissions. Require artoolkitX v1.1.12.

Author: philip-lamb

Android/app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-feature android:name="android.hardware.camera.any" />
     <uses-feature android:name="android.hardware.camera"

Android/app/src/main/cpp/CMakeLists.txt

@@ -107,6 +107,7 @@ set(SOURCE
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/version.h
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/calib_camera.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/calib_camera.h
+    ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/calib_camera_jni.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/Calibration.hpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/Calibration.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/calc.cpp

Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationJNI.java

@@ -1,9 +1,50 @@
+/*
+ *  CameraCalibrationJNI.java
+ *  artoolkitX
+ *
+ *  This file is part of artoolkitX.
+ *
+ *  artoolkitX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  artoolkitX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with artoolkitX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  As a special exception, the copyright holders of this library give you
+ *  permission to link this library with independent modules to produce an
+ *  executable, regardless of the license terms of these independent modules, and to
+ *  copy and distribute the resulting executable under terms of your choice,
+ *  provided that you also meet, for each linked independent module, the terms and
+ *  conditions of the license of that module. An independent module is a module
+ *  which is neither derived from nor based on this library. If you modify this
+ *  library, you may extend this exception to your version of the library, but you
+ *  are not obligated to do so. If you do not wish to do so, delete this exception
+ *  statement from your version.
+ *
+ *  Copyright 2023 Philip Lamb.
+ *
+ *  Author(s): Philip Lamb
+ *
+ */
+
+//
+// Prototypes for a handful of entry points to allow the Java code to call into the
+// native side.
+// The native side of this interface is in the file camera_calibration_jni.cpp.
+//
+
 package org.artoolkitx.utilities.cameracalibration;
 
 public class CameraCalibrationJNI {
 
     public static native void handleBackButton();
     public static native void handleAddButton();
-
     public static native void sendPreferencesChangedEvent();
 }

Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationSettingsFragment.java

@@ -8,14 +8,12 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
 import android.widget.EditText;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
-import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.SwitchPreferenceCompat;
 

calib_camera.cpp

@@ -645,6 +645,11 @@ int main(int argc, char *argv[])
                         if (ar2VideoGetParami(vid, AR_VIDEO_PARAM_AVFOUNDATION_CAMERA_POSITION, &frontCamera) >= 0) {
                             gCameraIsFrontFacing = (frontCamera == AR_VIDEO_AVFOUNDATION_CAMERA_POSITION_FRONT);
                         }
+                    } else if (vid->module == AR_VIDEO_MODULE_ANDROID) {
+                        int frontCamera;
+                        if (ar2VideoGetParami(vid, AR_VIDEO_PARAM_ANDROID_CAMERA_FACE, &frontCamera) >= 0) {
+                            gCameraIsFrontFacing = (frontCamera == AR_VIDEO_ANDROID_CAMERA_FACE_FRONT);
+                        }
                     }
                     bool contentRotate90, contentFlipV, contentFlipH;
                     if (gDisplayOrientation == 1) { // Landscape with top of device at left.
@@ -1238,30 +1243,23 @@ static void saveParam(const ARParam *param, ARdouble err_min, ARdouble err_avg,
 
         AR2VideoParamT *vid = vs->getAR2VideoParam();
         if (ar2VideoGetParams(vid, AR_VIDEO_PARAM_DEVICEID, &device_id) < 0 || !device_id) {
-            ARLOGe("Error fetching camera device identification.\n");
+            ARLOGe("Video input module does not support fetching device identification.\n");
         }
         if (ar2VideoGetParams(vid, AR_VIDEO_PARAM_NAME, &name) < 0 || !name) {
-            ARLOGe("Error fetching camera name.\n");
+            ARLOGi("Video input module does not support fetching input name.\n");
+        }
+        if (!device_id && !name) {
+            ARLOGw("Neither video input device identification nor name available.\n");
         }
 
-        if (vid->module == AR_VIDEO_MODULE_AVFOUNDATION) {
-            int focalPreset;
-            ar2VideoGetParami(vid, AR_VIDEO_PARAM_AVFOUNDATION_FOCUS_PRESET, &focalPreset);
-            switch (focalPreset) {
-                case AR_VIDEO_AVFOUNDATION_FOCUS_MACRO:
-                    focal_length = strdup("0.01");
-                    break;
-                case AR_VIDEO_AVFOUNDATION_FOCUS_0_3M:
-                    focal_length = strdup("0.3");
-                    break;
-                case AR_VIDEO_AVFOUNDATION_FOCUS_1_0M:
-                    focal_length = strdup("1.0");
-                    break;
-                case AR_VIDEO_AVFOUNDATION_FOCUS_INF:
-                    focal_length = strdup("1000000.0");
-                    break;
-                default:
-                    break;
+        double f;
+        if (ar2VideoGetParamd(vid, AR_VIDEO_PARAM_CAMERA_FOCAL_LENGTH, &f) < 0) {
+            ARLOGi("Video input module does not support fetching focal length.\n");
+        } else {
+            if (f > 0.0) {
+                if (asprintf(&focal_length, "%.3f", f) < 0) {
+                    ARLOGe("Error writing focal length.\n");
+                }
             }
         }
         if (!focal_length) {
@@ -1270,7 +1268,11 @@ static void saveParam(const ARParam *param, ARdouble err_min, ARdouble err_avg,
         }
 
         if (gCalibrationSave) {
-            
+#ifdef ANDROID
+            if (SDL_AndroidRequestPermission("android.permission.WRITE_EXTERNAL_STORAGE") != SDL_TRUE) {
+                ARLOGe("Error: Unable to write to external storage.\n");
+            } else {
+#endif
             // Assemble the filename.
             char calibrationSavePathname[SAVEPARAM_PATHNAME_LEN];
             snprintf(calibrationSavePathname, SAVEPARAM_PATHNAME_LEN, "%s/camera_para-", gCalibrationSaveDir);
@@ -1297,6 +1299,10 @@ static void saveParam(const ARParam *param, ARdouble err_min, ARdouble err_avg,
             } else {
                 ARLOGi("Saved calibration to '%s'.\n", calibrationSavePathname);
             }
+#ifdef ANDROID
+            }
+#endif
+            
         }
 
         // Check for early exit.
@@ -1448,31 +1454,3 @@ static void saveParam(const ARParam *param, ARdouble err_min, ARdouble err_avg,
     }
     free(cachePath);
 }
-
-#ifdef ANDROID
-#include <jni.h>
-#define JNIFUNCTION_CC(sig) Java_org_artoolkitx_utilities_cameracalibration_CameraCalibrationJNI_##sig
-
-extern "C" JNIEXPORT void JNICALL JNIFUNCTION_CC(handleBackButton(void))
-{
-    flowHandleEvent(EVENT_BACK_BUTTON);
-}
-
-extern "C" JNIEXPORT void JNICALL JNIFUNCTION_CC(handleAddButton(void))
-{
-    flowHandleEvent(EVENT_TOUCH);
-}
-
-extern "C" JNIEXPORT void JNICALL JNIFUNCTION_CC(sendPreferencesChangedEvent(void))
-{
-    SDL_Event event;
-    SDL_zero(event);
-    event.type = gSDLEventPreferencesChanged;
-    event.user.code = (Sint32)0;
-    event.user.data1 = NULL;
-    event.user.data2 = NULL;
-    SDL_PushEvent(&event);
-}
-
-#endif
-

calib_camera_jni.cpp

@@ -0,0 +1,78 @@
+/*
+ *  calib_camera_jni.cpp
+ *  artoolkitX
+ *
+ *  This file is part of artoolkitX.
+ *
+ *  artoolkitX is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  artoolkitX is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with artoolkitX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  As a special exception, the copyright holders of this library give you
+ *  permission to link this library with independent modules to produce an
+ *  executable, regardless of the license terms of these independent modules, and to
+ *  copy and distribute the resulting executable under terms of your choice,
+ *  provided that you also meet, for each linked independent module, the terms and
+ *  conditions of the license of that module. An independent module is a module
+ *  which is neither derived from nor based on this library. If you modify this
+ *  library, you may extend this exception to your version of the library, but you
+ *  are not obligated to do so. If you do not wish to do so, delete this exception
+ *  statement from your version.
+ *
+ *  Copyright 2023 Philip Lamb.
+ *
+ *  Author(s): Philip Lamb
+ *
+ */
+
+//
+// Presents a handful of entry points to allow the Java code to call into the
+// native side.
+// The Java side of this interface is in the class
+// org.artoolkitx.utilities.cameracalibration.CameraCalibrationJNI.
+//
+
+#ifdef ANDROID
+
+#include "flow.hpp"
+#include "calib_camera.h"
+
+#include <jni.h>
+
+#define JNIFUNCTION_CC(sig) Java_org_artoolkitx_utilities_cameracalibration_CameraCalibrationJNI_##sig
+
+extern "C" {
+
+JNIEXPORT void JNICALL JNIFUNCTION_CC(handleBackButton(void))
+{
+    flowHandleEvent(EVENT_BACK_BUTTON);
+}
+
+JNIEXPORT void JNICALL JNIFUNCTION_CC(handleAddButton(void))
+{
+    flowHandleEvent(EVENT_TOUCH);
+}
+
+JNIEXPORT void JNICALL JNIFUNCTION_CC(sendPreferencesChangedEvent(void))
+{
+    SDL_Event event;
+    SDL_zero(event);
+    event.type = gSDLEventPreferencesChanged;
+    event.user.code = (Sint32)0;
+    event.user.data1 = NULL;
+    event.user.data2 = NULL;
+    SDL_PushEvent(&event);
+}
+
+}
+#endif
+

prefsAndroid.cpp

@@ -310,6 +310,6 @@ float getPreferencesCalibrationPatternSpacing(void *preferences)
 
 char *getPreferenceCalibSaveDir(void *preferences)
 {
-    return arUtilGetResourcesDirectoryPath(AR_UTIL_RESOURCES_DIRECTORY_BEHAVIOR_USE_USER_ROOT, NULL);
+    return arUtilGetResourcesDirectoryPath(AR_UTIL_RESOURCES_DIRECTORY_BEHAVIOR_USE_APP_EXTERNAL_DATA_DIR, NULL);
 }
 #endif