Merge pull request #2 from paulondcdev/NativeFileDialogImprovements

Native file dialog improvements
paulondc · Aug 30, 2016 · 2a58175 · 2a58175
2 parents b9a5231 + 4893d35
commit 2a58175
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/qpm.json b/qpm.json
@@ -10,7 +10,7 @@
     "url": "https://github.com/paulondc/quicknative.git"
   },
   "version": {
-    "label": "0.1.0"
+    "label": "0.2.0"
   },
   "pri_filename": "quicknative.pri",
   "license": "MIT"

diff --git a/source/cpp/nativefiledialogandroid.cpp b/source/cpp/nativefiledialogandroid.cpp
@@ -13,10 +13,8 @@ void NativeFileDialogAndroid::open(QUrl initialFolder=QUrl()) {
         QAndroidJniObject intent("android/content/Intent");
         QString contentType;
 
-        // querying the buildVersion to make sure the multiple selection feature is available
-        int buildVersion = QAndroidJniObject::getStaticField<jint>("android/os/Build$VERSION", "SDK_INT");
-
-        if (m_selectMultiple && buildVersion >= 19) {
+        // querying the android version to make sure the multiple selection feature is available
+        if (m_selectMultiple && QtAndroid::androidSdkVersion() >= 19) {
             intent.callObjectMethod("putExtra","(Ljava/lang/String;Z)Landroid/content/Intent;",
                 QAndroidJniObject::getStaticObjectField("android/content/Intent", "EXTRA_ALLOW_MULTIPLE", "Ljava/lang/String;").object<jobject>(), true);
         }
@@ -117,13 +115,14 @@ QString NativeFileDialogAndroid::filePath(QAndroidJniObject & uri) {
     // otherwise query the file path through content resolver
     else {
 
+
         QAndroidJniEnvironment env;
 
         QAndroidJniObject mediaStore = QAndroidJniObject::getStaticObjectField("android/provider/MediaStore$MediaColumns", "DATA", "Ljava/lang/String;");
 
         jobjectArray projection = (jobjectArray)env->NewObjectArray(1, env->FindClass("java/lang/String"), env->NewStringUTF(""));
 
-        env->SetObjectArrayElement(projection, 0, env->NewStringUTF(mediaStore.toString().toStdString().c_str()));
+        env->SetObjectArrayElement(projection, 0, mediaStore.object<jstring>());
 
         QAndroidJniObject contentResolver = QtAndroid::androidActivity().callObjectMethod("getContentResolver", "()Landroid/content/ContentResolver;");
 

diff --git a/source/cpp/nativefiledialogext.cpp b/source/cpp/nativefiledialogext.cpp
@@ -120,13 +120,9 @@ NativeFileDialogExt* NativeFileDialogExt::qmlAttachedProperties(QObject * object
     return new NativeFileDialogExt();
 }
 
-struct NativeFileDialogExtTypeRegisterHelper {
-
-    NativeFileDialogExtTypeRegisterHelper() {
-
-        // overriding the qml version when this component is avaiable
-        qmlRegisterType<NativeFileDialogExt>("QuickNative", 0, 1, "NativeFileDialog");
-    }
-};
+static void registerNativeFileDialogExt() {
+    // overriding the qml version when this component is avaiable
+    qmlRegisterType<NativeFileDialogExt>("QuickNative", 0, 1, "NativeFileDialog");
+}
 
-static const NativeFileDialogExtTypeRegisterHelper typeRegisterHelper;
+Q_COREAPP_STARTUP_FUNCTION(registerNativeFileDialogExt)