android manifest update and code layout fix

MerginMaps · May 15, 2024 · cc302b8 · cc302b8
1 parent 829c476
commit cc302b8
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 34 deletions.
diff --git a/app/inpututils.cpp b/app/inpututils.cpp
@@ -2180,37 +2180,37 @@ QString InputUtils::getDeviceModel()
 
 bool InputUtils::openLink( const QString &homePath, const QString &link )
 {
-    if ( link.startsWith( LOCAL_FILE_PREFIX ) )
+  if ( link.startsWith( LOCAL_FILE_PREFIX ) )
+  {
+    QString relativePath = link.mid( QString( LOCAL_FILE_PREFIX ).length() );
+    QString absoluteLinkPath = homePath + QDir::separator() + relativePath;
+    if ( !fileExists( absoluteLinkPath ) )
     {
-        QString relativePath = link.mid( QString( LOCAL_FILE_PREFIX ).length() );
-        QString absoluteLinkPath = homePath + QDir::separator() + relativePath;
-        if ( !fileExists( absoluteLinkPath ) )
-        {
-            return false;
-        }
+      return false;
+    }
 #ifdef Q_OS_ANDROID
-        if ( !mAndroidUtils->openFile( absoluteLinkPath ) )
-        {
-            return false;
-        }
+    if ( !mAndroidUtils->openFile( absoluteLinkPath ) )
+    {
+      return false;
+    }
 #elif defined(Q_OS_IOS)
-        if ( ! IosUtils::openFile( absoluteLinkPath ) )
-        {
-            return false;
-        }
-#else
-        // Desktop environments
-        QUrl fileUrl = QUrl::fromLocalFile( absoluteLinkPath );
-        if ( !QDesktopServices::openUrl( fileUrl ) )
-        {
-            return false;
-        }
-#endif
+    if ( ! IosUtils::openFile( absoluteLinkPath ) )
+    {
+      return false;
     }
-    else
+#else
+    // Desktop environments
+    QUrl fileUrl = QUrl::fromLocalFile( absoluteLinkPath );
+    if ( !QDesktopServices::openUrl( fileUrl ) )
     {
-        QDesktopServices::openUrl( QUrl( link ) );
+      return false;
     }
+#endif
+  }
+  else
+  {
+    QDesktopServices::openUrl( QUrl( link ) );
+  }
 
-    return true;
+  return true;
 }
diff --git a/app/ios/iosutils.cpp b/app/ios/iosutils.cpp
@@ -86,7 +86,7 @@ QString IosUtils::getDeviceModel()
 bool IosUtils::openFile( const QString &filePath )
 {
 #ifdef Q_OS_IOS
-    return openFileImpl( filePath );
+  return openFileImpl( filePath );
 #else
   return false;
 #endif

diff --git a/app/ios/iosutils.mm b/app/ios/iosutils.mm
@@ -14,16 +14,16 @@
  ***************************************************************************/
 
 #include <UIKit/UIKit.h>
-<<<<<<< HEAD
+<<< <<< < HEAD
 #include <sys/utsname.h>
-=======
+== == == =
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #include <QString>
->>>>>>> 05801f46 (ios pdf viewing)
+  >>> >>> > 05801f46( ios pdf viewing )
 #include "iosutils.h"
 
-void IosUtils::setIdleTimerDisabled()
+  void IosUtils::setIdleTimerDisabled()
 {
   [[UIApplication sharedApplication] setIdleTimerDisabled:YES];
 }

diff --git a/cmake_templates/AndroidManifest.xml.in b/cmake_templates/AndroidManifest.xml.in
@@ -100,10 +100,15 @@
         <service android:process=":trackingThread" android:name=".PositionTrackingService" android:foregroundServiceType="location" android:stopWithTask="true"/>
     </application>
 
-    <!-- Explicitly mention that we need to use external app for capturing an image -->
+    <!-- Explicitly mention that we need to use external app for capturing an image and open file-->
     <queries>
-      <intent>
+    <intent>
         <action android:name="android.media.action.IMAGE_CAPTURE" />
-      </intent>
+    </intent>
+    <intent>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.BROWSABLE" />
+        <data android:scheme="https" />
+    </intent>
     </queries>
 </manifest>