User keyboards are now stored under QStandardPaths::GenericDataLocation,

which seems to map to /storage/emulated/0.
mikkosyrja · May 31, 2019 · a295693 · a295693
1 parent 9701dad
commit a295693
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
@@ -81,4 +81,8 @@
 
 
 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
+
+
+
 </manifest>
diff --git a/engine/manager.cpp b/engine/manager.cpp
@@ -110,24 +110,18 @@ Manager::Manager(QObject* parent) : QObject(parent)
 	std::sort(constants.begin(), constants.end(), [](const Constant& first, const Constant& second)
 		{ return first.name.compare(second.name, Qt::CaseInsensitive) < 0; });
 
+	QString datapath = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation),
+		"Android/data/org.syrja.speedcrunch/files");
 	QtAndroid::requestPermissions(QStringList("android.permission.WRITE_EXTERNAL_STORAGE"), [](QtAndroid::PermissionResultMap result)
 	{
+		QString keyboardpath = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation),
+			"Android/data/org.syrja.speedcrunch/files/keyboards");	//## lambda capture does not work?
 		if ( result["android.permission.WRITE_EXTERNAL_STORAGE"] == QtAndroid::PermissionResult::Granted )
-		{
-//			QString datapath = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::DataLocation),
-//				QCoreApplication::applicationName());
-			QString datapath = "/data/media/0/Android/data/org.syrja.speedcrunch";
-			QDir().mkpath(datapath);
-
-//			QString filePath = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/" + extension + "."+ extension;
-//			QAndroidJniObject javaFilenameStr = QAndroidJniObject::fromString(filePath);
-//			QAndroidJniObject javaSendToStr = QAndroidJniObject::fromString(receiver);
-//			QAndroidJniObject::callStaticMethod<void>("app/email/Mailer","sendMail","(Ljava/lang/String;Ljava/lang/String;)V", javaFilenameStr.object<jstring>(), javaSendToStr.object<jstring>());
-		}
+			QDir().mkpath(keyboardpath);
 	});
 
 	std::vector<QString> paths;
-	paths.push_back(configpath + "/keyboards/");
+	paths.push_back(datapath + "/keyboards/");
 	paths.push_back(":/keyboards/");
 	for ( const auto& path : paths )
 	{
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,4 +81,8 @@


		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>




		</manifest>