diff --git a/client/ios/app/Info.plist.in b/client/ios/app/Info.plist.in index 97f88953..19272c89 100644 --- a/client/ios/app/Info.plist.in +++ b/client/ios/app/Info.plist.in @@ -80,6 +80,92 @@ + + UTTypeConformsTo + + public.data + + UTTypeDescription + WireGuard config + UTTypeIconFiles + + UTTypeIdentifier + org.amnezia.AmneziaVPN.wireguard-config + UTTypeTagSpecification + + public.filename-extension + + conf + cfg + + public.mime-type + + text/plain + + + + + UTTypeConformsTo + + public.data + + UTTypeDescription + OpenVPN config + UTTypeIconFiles + + UTTypeIdentifier + org.amnezia.AmneziaVPN.openvpn-config + UTTypeTagSpecification + + public.filename-extension + + ovpn + + public.mime-type + + text/plain + + + + + UTTypeConformsTo + + public.data + + UTTypeDescription + AmneziaVPN backup file + UTTypeIconFiles + + UTTypeIdentifier + org.amnezia.AmneziaVPN.backup-config + UTTypeTagSpecification + + public.filename-extension + + backup + + public.mime-type + + text/plain + + + + CFBundleDocumentTypes + + + CFBundleTypeName + Amnezia VPN config + LSHandlerRank + Alternate + LSItemContentTypes + + org.amnezia.AmneziaVPN.amnezia-config + org.amnezia.AmneziaVPN.wireguard-config + org.amnezia.AmneziaVPN.openvpn-config + org.amnezia.AmneziaVPN.backup-config + + + - \ No newline at end of file + diff --git a/client/platforms/android/android_controller.cpp b/client/platforms/android/android_controller.cpp index ad00abdf..91d1317d 100644 --- a/client/platforms/android/android_controller.cpp +++ b/client/platforms/android/android_controller.cpp @@ -249,7 +249,7 @@ void AndroidController::cleanupBackendLogs() { } void AndroidController::importConfig(const QString& data){ - m_startPageLogic->selectConfigFormat(data); + m_startPageLogic->importAnyFile(data); } const QJsonObject &AndroidController::vpnConfig() const diff --git a/client/platforms/ios/QtAppDelegate.mm b/client/platforms/ios/QtAppDelegate.mm index 0b1092db..f65856d9 100644 --- a/client/platforms/ios/QtAppDelegate.mm +++ b/client/platforms/ios/QtAppDelegate.mm @@ -73,15 +73,13 @@ NSLog(@"Application openURL: %@", url); if (url.fileURL) { QString filePath(url.path.UTF8String); - qDebug() << "filePath:" << filePath; if (filePath.isEmpty()) return NO; QFile file(filePath); bool isOpenFile = file.open(QIODevice::ReadOnly); - qDebug() << "isOpenFile:" << isOpenFile; QByteArray data = file.readAll(); - [QtAppDelegate sharedQtAppDelegate].startPageLogic->importConnectionFromCode(QString(data)); + [QtAppDelegate sharedQtAppDelegate].startPageLogic->importAnyFile(QString(data)); return YES; } return NO; diff --git a/client/ui/pages_logic/StartPageLogic.cpp b/client/ui/pages_logic/StartPageLogic.cpp index 8d9c33f6..f7b685ea 100644 --- a/client/ui/pages_logic/StartPageLogic.cpp +++ b/client/ui/pages_logic/StartPageLogic.cpp @@ -192,7 +192,7 @@ void StartPageLogic::onPushButtonImportOpenFile() file.open(QIODevice::ReadOnly); QByteArray data = file.readAll(); - selectConfigFormat(QString(data)); + importAnyFile(QString(data)); } #ifdef Q_OS_ANDROID @@ -202,7 +202,7 @@ void StartPageLogic::startQrDecoder() } #endif -void StartPageLogic::selectConfigFormat(QString configData) +void StartPageLogic::importAnyFile(const QString &configData) { auto configFormat = checkConfigFormat(configData); if (configFormat == ConfigTypes::OpenVpn) { diff --git a/client/ui/pages_logic/StartPageLogic.h b/client/ui/pages_logic/StartPageLogic.h index a20fd6c7..bfca6e60 100644 --- a/client/ui/pages_logic/StartPageLogic.h +++ b/client/ui/pages_logic/StartPageLogic.h @@ -37,7 +37,7 @@ public: Q_INVOKABLE void startQrDecoder(); #endif - void selectConfigFormat(QString configData); + void importAnyFile(const QString &configData); bool importConnection(const QJsonObject &profile); bool importConnectionFromCode(QString code);