Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #583 #584

Merged
merged 1 commit into from
Jul 20, 2024
Merged

Fix #583 #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 34 additions & 47 deletions config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget android-versionCode="57" defaultlocale="en" id="org.adaptit.adaptitmobile" ios-CFBundleVersion="1" version="1.16.4" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:gap="http://phonegap.com/ns/1.0">
<widget android-versionCode="58" defaultlocale="en" id="org.adaptit.adaptitmobile" ios-CFBundleVersion="1" version="1.16.5" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:gap="http://phonegap.com/ns/1.0">
<name short="Adapt It Mobile" xml:lang="en">Adapt It Mobile</name>
<description xml:lang="en">
An open source application for translating between related languages.
Expand All @@ -19,10 +19,9 @@
<preference name="SplashShowOnlyFirstTime" value="false" />
<preference name="AutoHideSplashScreen" value="true" />
<platform name="android">
<hook type="before_build" src="scripts/before-build.js" />
<hook src="scripts/before-build.js" type="before_build" />
<plugin name="cordova-sqlite-evcore-extbuild-free" spec="^0.15.1" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.3" />
<!-- min SDK 26/Android 8.x: lowest SDK that supports adaptive icons (for splash / app icon) -->
<preference name="android-minSdkVersion" value="26" />
<preference name="android-targetSdkVersion" value="34" />
<preference name="AndroidWindowSplashScreenAnimatedIcon" value="www/res/svg/ic_aim_adaptive_splash.xml" />
Expand All @@ -36,12 +35,6 @@
<application android:largeHeap="true" />
</edit-config>
<config-file mode="replace" parent="/manifest" target="AndroidManifest.xml">
<!-- permissions move from READ_EXTERNAL_STORAGE to the more granular ones in API 30; unfortunately the FilePath plugin requires
all 3 new permissions before it returns the correct path to us. See issue #581. -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<uses-feature android:name="android.hardware.faketouch" android:required="false" />
</config-file>
<config-file mode="replace" parent="./application/activity" target="AndroidManifest.xml">
Expand All @@ -56,8 +49,6 @@
<data android:scheme="content" />
<data android:scheme="file" />
<data android:mimeType="*/*" />
<!-- our mimeType is really broad; limit to our 7 supported filetypes
(and work around Android's ugly path pattern matching system) -->
<data android:pathPattern=".*\\.xml" />
<data android:pathPattern=".*\\.tmx" />
<data android:pathPattern=".*\\.txt" />
Expand Down Expand Up @@ -105,44 +96,41 @@
<resource-file src="www/res/icon/ios/usx_44.png" />
<resource-file src="www/res/icon/ios/usx_64.png" />
<resource-file src="www/res/icon/ios/usx_320.png" />
<!-- EDB 5 Apr 2024: new privacy API requirement for iOS / this fills in PrivacyInfo.xcprivacy template -->
<privacy-manifest>
<key>NSPrivacyTracking</key>
<false />
<key>NSPrivacyTrackingDomains</key>
<array />
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>0A2A.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>E174.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<key>NSPrivacyTracking</key>
<false />
<key>NSPrivacyTrackingDomains</key>
<array />
<key>NSPrivacyCollectedDataTypes</key>
<array />
<key>NSPrivacyAccessedAPITypes</key>
<array>
<string>CA92.1</string>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>0A2A.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>E174.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>CA92.1</string>
</array>
</dict>
</array>
</dict>
</array>
</privacy-manifest>
<!-- EDB 8/16/21 TODO: config-file items are up to date, but some icon files do need to be
manually copied over into the XCode project before releasing. -->
<config-file mode="replace" parent="UISupportedInterfaceOrientations" target="*-Info.plist">
<array>
<string>UIInterfaceOrientationPortrait</string>
Expand Down Expand Up @@ -378,7 +366,7 @@
<icon height="80" src="www/res/icon/ios/[email protected]" width="80" />
<icon height="50" src="www/res/icon/ios/icon-50.png" width="50" />
<icon height="100" src="www/res/icon/ios/[email protected]" width="100" />
<icon src="www/res/icon/ios/icon-1024.png" width="1024" height="1024" />
<icon height="1024" src="www/res/icon/ios/icon-1024.png" width="1024" />
<splash src="www/res/screen/ios/Default@2x~universal~anyany.png" />
<splash src="www/res/screen/ios/Default@3x~universal~anyany.png" />
</platform>
Expand All @@ -401,7 +389,6 @@
</platform>
<plugin name="cordova-plugin-chooser" spec="^1.3.1" />
<plugin name="cordova-plugin-fonts" spec="^0.6.5" />
<plugin name="cordova-plugin-filepath" spec="https://github.com/VIAVI-Solutions/cordova-plugin-filepath.git" />
<plugin name="cordova-plugin-keyboard" spec="https://github.com/sinn1/cordova-plugin-keyboard.git" />
<plugin name="phonegap-plugin-mobile-accessibility" spec="https://github.com/phonegap/phonegap-mobile-accessibility.git" />
<plugin name="cordova-clipboard" spec="https://github.com/ihadeed/cordova-clipboard.git" />
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adapt-it-mobile",
"version": "1.16.4",
"version": "1.16.5",
"description": "Adapt It Mobile",
"repository": {
"type": "git",
Expand All @@ -26,7 +26,7 @@
"cordova-plugin-device": "github:apache/cordova-plugin-device",
"cordova-plugin-dialogs": "^2.0.2",
"cordova-plugin-file": "^8.0.0",
"cordova-plugin-filepath": "github:VIAVI-Solutions/cordova-plugin-filepath",
"cordova-plugin-filepath": "github:adapt-it/cordova-plugin-filepath",
"cordova-plugin-keyboard": "github:sinn1/cordova-plugin-keyboard",
"cordova-plugin-network-information": "github:apache/cordova-plugin-network-information",
"cordova-sqlite-evcore-extbuild-free": "^0.18.0",
Expand Down Expand Up @@ -82,13 +82,13 @@
},
"cordova-plugin-keyboard": {},
"cordova-clipboard": {},
"cordova-plugin-filepath": {},
"cordova-sqlite-evcore-extbuild-free": {},
"cordova-plugin-file": {
"ANDROIDX_WEBKIT_VERSION": "1.4.0"
},
"cordova-plugin-chooser": {},
"cordova-plugin-save-dialog": {}
"cordova-plugin-save-dialog": {},
"cordova-plugin-filepath": {}
},
"platforms": [
"ios",
Expand Down
4 changes: 2 additions & 2 deletions www/js/Application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ define(function (require) {
searchIndex: 0,
currentProject: null,
localURLs: [],
version: "1.16.4", // appended with Android / iOS build info
AndroidBuild: "57", // (was milestone release #)
version: "1.16.5", // appended with Android / iOS build info
AndroidBuild: "58", // (was milestone release #)
iOSBuild: "1", // iOS uploaded build number for this release (increments from 1 for each release)
importingURL: "", // for other apps in Android-land sending us files to import

Expand Down
Loading