Skip to content

Commit c81f7d5

Browse files
author
Bitrise Buildbot
committed
Bitrise build 13690
1 parent 16168ba commit c81f7d5

25 files changed

+132
-275
lines changed

‎geotabdrivesdk/build.gradle.kts‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import java.util.Properties
22

3-
val versionName = "6.7.7_74683"
3+
val versionName = "6.7.8_74690"
44

55
plugins {
66
id("com.android.library")
@@ -9,7 +9,6 @@ plugins {
99
id("maven-publish")
1010
id("kotlin-parcelize")
1111
id("com.google.devtools.ksp")
12-
id ("org.jetbrains.kotlinx.kover")
1312
}
1413

1514
apply {
@@ -31,9 +30,6 @@ android {
3130

3231
buildConfigField("String", "KEYSTORE_ALIAS", "\"" + System.getenv("KEYSTORE_ALIAS") + "\"")
3332
buildConfigField("String", "VERSION_NAME", "\"${versionName}\"")
34-
35-
manifestPlaceholders["appLinkHost"] = ""
36-
manifestPlaceholders["appAuthRedirectPathPrefix"] = ""
3733
}
3834

3935
buildTypes {
@@ -125,7 +121,6 @@ dependencies {
125121
dokkaPlugin("org.jetbrains.dokka:android-documentation-plugin:1.8.10")
126122
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
127123
implementation("androidx.core:core-ktx:1.12.0")
128-
implementation("net.openid:appauth:0.11.1")
129124
implementation("androidx.constraintlayout:constraintlayout:2.0.3")
130125
implementation("androidx.appcompat:appcompat:1.1.0")
131126
implementation("androidx.exifinterface:exifinterface:1.3.1")
@@ -199,23 +194,13 @@ publishing {
199194
}
200195
}
201196
}
202-
kover {
203-
currentProject {
204-
createVariant("custom") {
205-
addWithDependencies("debug")
206-
}
207-
}
208-
}
209197

210198
tasks.register<Copy>("copyTestFiles") {
211199
from("src/main/assets")
212200
into("src/test/resources")
213201
}
214202

215203
afterEvaluate {
216-
tasks.named("testReleaseUnitTest") {
217-
enabled = false // This will disable it from running in all cases, including via 'check'
218-
}
219204
tasks.named("processDebugUnitTestJavaRes") {
220205
dependsOn("copyTestFiles")
221206
}

‎geotabdrivesdk/native-sdk.d.ts‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -502,26 +502,6 @@ declare namespace geotabModules {
502502
function setStatusPiP(argument: { isEnabled: boolean }, callback: (err?: Error, result?: undefined) => void);
503503
}
504504

505-
namespace login {
506-
enum GeotabAppId {
507-
GEOTAB_DRIVE = 0,
508-
MYGEOTAB
509-
}
510-
511-
/*******
512-
* Start the login function integrated with Chrome Custom Tabs.
513-
* @param argument: { clientId: string, discoveryUri: string, geotabAppId: GeotabAppId, loginHint: string? }
514-
* @param callback:
515-
* - result: string. A GeotabAuthState object.
516-
* The loginHint parameter is optional. It is used to pre-fill the username field in the login page.
517-
* On a successful call a GeotabAuthState object turned into JSON will be given as result
518-
* If there's an error while logging in, err will be given.
519-
* GeotabAuthState object contains the following properties:
520-
* { accessToken: string, idToken: string, refreshToken: string }
521-
*/
522-
function start(argument: { clientId: string, discoveryUri: string, geotabAppId: GeotabAppId, loginHint: string? }, callback: (err?: Error, result?: string) => void);
523-
}
524-
525505
namespace appearance {
526506
enum AppearanceType {
527507
Unknown = 0,

‎geotabdrivesdk/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@
5151
android:resource="@xml/accessory_filter" />
5252
</activity>
5353

54-
<activity
55-
android:name="net.openid.appauth.RedirectUriReceiverActivity"
56-
android:exported="true"
57-
android:taskAffinity=""
58-
tools:node="replace">
59-
</activity>
6054
<service
6155
android:name="com.geotab.mobile.sdk.module.app.ForeGroundService"
6256
android:foregroundServiceType="specialUse"
@@ -73,13 +67,13 @@
7367
android:exported="false" />
7468

7569
<provider
76-
android:name="com.geotab.mobile.sdk.GeotabFileProvider"
77-
android:authorities="${applicationId}.geotab.provider"
70+
android:name="androidx.core.content.FileProvider"
71+
android:authorities="${applicationId}.provider"
7872
android:exported="false"
7973
android:grantUriPermissions="true">
8074
<meta-data
8175
android:name="android.support.FILE_PROVIDER_PATHS"
82-
android:resource="@xml/geotab_file_provider_paths" />
76+
android:resource="@xml/file_provider_paths" />
8377
</provider>
8478

8579
<meta-data

‎geotabdrivesdk/src/main/assets/ModuleFunction.LocalNotification.Cancel.Script.js‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,14 @@ window.{{geotabModules}}.{{moduleName}}.{{functionName}} = (id, callback) => {
2828
'>>>>> User provided callback throws uncaught exception: ',
2929
err.message
3030
);
31-
} finally {
32-
delete window.{{geotabNativeCallbacks}}[nativeCallback];
3331
}
34-
};
35-
try {
36-
// eslint-disable-next-line no-undef
37-
{{interfaceName}}.postMessage(
38-
'{{moduleName}}',
39-
'{{functionName}}',
40-
JSON.stringify({ result: id }),
41-
`{{geotabNativeCallbacks}}.${nativeCallback}`
42-
);
43-
} catch (err) {
44-
console.log(
45-
'>>>>> Unexpected exception in JavascriptInterface callback: ',
46-
err.message
47-
);
4832
delete window.{{geotabNativeCallbacks}}[nativeCallback];
49-
}
33+
};
34+
// eslint-disable-next-line no-undef
35+
{{interfaceName}}.postMessage(
36+
'{{moduleName}}',
37+
'{{functionName}}',
38+
JSON.stringify({ result: id }),
39+
`{{geotabNativeCallbacks}}.${nativeCallback}`
40+
);
5041
};

‎geotabdrivesdk/src/main/assets/ModuleFunction.Off.Script.js‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,11 @@ window.{{geotabModules}}.{{moduleName}}.{{functionName}} = (eventName, callback)
2525
if (mod.___offCallback == null) {
2626
mod.___offCallback = () => {};
2727
}
28-
try {
29-
// eslint-disable-next-line no-undef
30-
{{interfaceName}}.postMessage(
31-
'{{moduleName}}',
32-
'{{functionName}}',
33-
JSON.stringify({ result: Object.keys(mod.onListeners) }),
34-
'window.{{geotabModules}}.{{moduleName}}.___offCallback'
35-
);
36-
} catch (err) {
37-
console.log(
38-
'>>>>> Unexpected exception in JavascriptInterface callback: ',
39-
err.message
40-
);
41-
}
28+
// eslint-disable-next-line no-undef
29+
{{interfaceName}}.postMessage(
30+
'{{moduleName}}',
31+
'{{functionName}}',
32+
JSON.stringify({ result: Object.keys(mod.onListeners) }),
33+
'window.{{geotabModules}}.{{moduleName}}.___offCallback'
34+
);
4235
};

‎geotabdrivesdk/src/main/assets/ModuleFunction.On.Script.js‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,11 @@ window.{{geotabModules}}.{{moduleName}}.{{functionName}} = (eventName, callback)
3131
});
3232
};
3333
}
34-
try {
35-
// eslint-disable-next-line no-undef
36-
{{interfaceName}}.postMessage(
37-
'{{moduleName}}',
38-
'{{functionName}}',
39-
JSON.stringify({ result: Object.keys(mod.onListeners) }),
40-
'window.{{geotabModules}}.{{moduleName}}.___onCallback'
41-
);
42-
} catch (err) {
43-
console.log(
44-
'>>>>> Unexpected exception in JavascriptInterface callback: ',
45-
err.message
46-
);
47-
}
34+
// eslint-disable-next-line no-undef
35+
{{interfaceName}}.postMessage(
36+
'{{moduleName}}',
37+
'{{functionName}}',
38+
JSON.stringify({ result: Object.keys(mod.onListeners) }),
39+
'window.{{geotabModules}}.{{moduleName}}.___onCallback'
40+
);
4841
};

‎geotabdrivesdk/src/main/assets/ModuleFunction.Script.js‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,21 @@
1-
window.{{geotabModules}}.{{moduleName}}.{{functionName}} = (
2-
params,
3-
callback
4-
) => {
5-
const nativeCallback = `{{callbackPrefix}}${Math.random()
6-
.toString(36)
7-
.substring(2)}`;
8-
window.{{geotabNativeCallbacks}}[nativeCallback] = async (
9-
error,
10-
response
11-
) => {
1+
window.{{geotabModules}}.{{moduleName}}.{{functionName}} = (params, callback) => {
2+
const nativeCallback = `{{callbackPrefix}}${Math.random().toString(36).substring(2)}`;
3+
window.{{geotabNativeCallbacks}}[nativeCallback] = async (error, response) => {
124
try {
135
await callback(error, response);
146
} catch (err) {
157
console.log(
168
'>>>>> User provided callback throws uncaught exception: ',
179
err.message
1810
);
19-
} finally {
20-
delete window.{{geotabNativeCallbacks}}[nativeCallback];
2111
}
22-
};
23-
24-
try {
25-
// eslint-disable-next-line no-undef
26-
{{interfaceName}}.postMessage(
27-
'{{moduleName}}',
28-
'{{functionName}}',
29-
JSON.stringify({ result: params }),
30-
`{{geotabNativeCallbacks}}.${nativeCallback}`
31-
);
32-
} catch (err) {
33-
console.log(
34-
'>>>>> Unexpected exception in JavascriptInterface callback: ',
35-
err.message
36-
);
3712
delete window.{{geotabNativeCallbacks}}[nativeCallback];
38-
}
13+
};
14+
// eslint-disable-next-line no-undef
15+
{{interfaceName}}.postMessage(
16+
'{{moduleName}}',
17+
'{{functionName}}',
18+
JSON.stringify({ result: params }),
19+
`{{geotabNativeCallbacks}}.${nativeCallback}`
20+
);
3921
};

‎geotabdrivesdk/src/main/assets/ModuleFunction.WriteFileAsBinary.Script.js‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,14 @@ window.{{geotabModules}}.{{moduleName}}.{{functionName}} = (params, callback) =>
1616
'>>>>> User provided callback throws uncaught exception: ',
1717
err.message
1818
);
19-
} finally {
20-
delete window.{{geotabNativeCallbacks}}[nativeCallback];
2119
}
22-
};
23-
try {
24-
// eslint-disable-next-line no-undef
25-
{{interfaceName}}.postMessage(
26-
'{{moduleName}}',
27-
'{{functionName}}',
28-
JSON.stringify({ result: options }),
29-
`{{geotabNativeCallbacks}}.${nativeCallback}`
30-
);
31-
} catch (err) {
32-
console.log(
33-
'>>>>> Unexpected exception in JavascriptInterface callback: ',
34-
err.message
35-
);
3620
delete window.{{geotabNativeCallbacks}}[nativeCallback];
37-
}
21+
};
22+
// eslint-disable-next-line no-undef
23+
{{interfaceName}}.postMessage(
24+
'{{moduleName}}',
25+
'{{functionName}}',
26+
JSON.stringify({ result: options }),
27+
`{{geotabNativeCallbacks}}.${nativeCallback}`
28+
);
3829
};

‎geotabdrivesdk/src/main/java/com/geotab/mobile/sdk/DownloadFiles.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.geotab.mobile.sdk
33
import android.app.DownloadManager
44
import android.content.Context
55
import android.content.Intent
6+
import android.net.Uri
67
import android.os.Build
78
import android.os.Environment
89
import android.util.Base64
@@ -12,7 +13,6 @@ import android.webkit.JavascriptInterface
1213
import android.webkit.URLUtil
1314
import android.widget.Toast
1415
import androidx.core.content.FileProvider
15-
import androidx.core.net.toUri
1616
import com.geotab.mobile.sdk.permission.Permission
1717
import com.geotab.mobile.sdk.permission.PermissionDelegate
1818
import com.geotab.mobile.sdk.permission.PermissionHelper
@@ -61,7 +61,7 @@ class DownloadFiles(
6161
) {
6262
try {
6363
val fileName = URLUtil.guessFileName(url, contentDisposition, mimeType)
64-
val downloadUri = url?.toUri()
64+
val downloadUri = Uri.parse(url)
6565
if (url?.startsWith("blob:https") == true) {
6666
blobToBase64(url, mimeType, fileName)
6767
return

0 commit comments

Comments
 (0)