Showing
5 changed files
with
32 additions
and
32 deletions
| ... | @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' | ... | @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' |
| 2 | 2 | ||
| 3 | ext { | 3 | ext { |
| 4 | PUBLISH_GROUP_ID = 'ly.warp' | 4 | PUBLISH_GROUP_ID = 'ly.warp' |
| 5 | - PUBLISH_VERSION = '4.5.5.4r32' | 5 | + PUBLISH_VERSION = '4.5.5.4r33' |
| 6 | PUBLISH_ARTIFACT_ID = 'warply-android-sdk' | 6 | PUBLISH_ARTIFACT_ID = 'warply-android-sdk' |
| 7 | } | 7 | } |
| 8 | 8 | ... | ... |
| ... | @@ -14,8 +14,8 @@ | ... | @@ -14,8 +14,8 @@ |
| 14 | tools:node="remove" /> | 14 | tools:node="remove" /> |
| 15 | <uses-permission android:name="com.huawei.appmarket.service.commondata.permission.GET_COMMON_DATA" /> | 15 | <uses-permission android:name="com.huawei.appmarket.service.commondata.permission.GET_COMMON_DATA" /> |
| 16 | <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> | 16 | <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> |
| 17 | - <uses-permission android:name="android.permission.FOREGROUND_SERVICE_HEALTH" /> | 17 | +<!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE_HEALTH" />--> |
| 18 | - <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" /> | 18 | +<!-- <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" />--> |
| 19 | <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> | 19 | <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> |
| 20 | <!-- <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />--> | 20 | <!-- <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />--> |
| 21 | <!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />--> | 21 | <!-- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />--> |
| ... | @@ -230,11 +230,11 @@ | ... | @@ -230,11 +230,11 @@ |
| 230 | 230 | ||
| 231 | <!-- android:stopWithTask="false"--> | 231 | <!-- android:stopWithTask="false"--> |
| 232 | <!-- android:process=":warplyHealthService"--> | 232 | <!-- android:process=":warplyHealthService"--> |
| 233 | - <service | 233 | +<!-- <service--> |
| 234 | - android:name=".services.WarplyHealthService" | 234 | +<!-- android:name=".services.WarplyHealthService"--> |
| 235 | - android:exported="false" | 235 | +<!-- android:exported="false"--> |
| 236 | - android:foregroundServiceType="health" | 236 | +<!-- android:foregroundServiceType="health"--> |
| 237 | - android:permission="android.permission.FOREGROUND_SERVICE" /> | 237 | +<!-- android:permission="android.permission.FOREGROUND_SERVICE" />--> |
| 238 | 238 | ||
| 239 | <service | 239 | <service |
| 240 | android:name=".services.WarplyBeaconsRangingService" | 240 | android:name=".services.WarplyBeaconsRangingService" |
| ... | @@ -288,14 +288,14 @@ | ... | @@ -288,14 +288,14 @@ |
| 288 | android:name=".receivers.WarplyInAppNotificationReceiver" | 288 | android:name=".receivers.WarplyInAppNotificationReceiver" |
| 289 | android:exported="false" /> | 289 | android:exported="false" /> |
| 290 | 290 | ||
| 291 | - <receiver | 291 | +<!-- <receiver--> |
| 292 | - android:name=".receivers.RestartHealthServiceReceiver" | 292 | +<!-- android:name=".receivers.RestartHealthServiceReceiver"--> |
| 293 | - android:exported="false"> | 293 | +<!-- android:exported="false">--> |
| 294 | - <intent-filter> | 294 | +<!-- <intent-filter>--> |
| 295 | -<!-- <action android:name="android.intent.action.BOOT_COMPLETED" />--> | 295 | +<!--<!– <action android:name="android.intent.action.BOOT_COMPLETED" />–>--> |
| 296 | - <action android:name="android.intent.action.RESTART" /> | 296 | +<!-- <action android:name="android.intent.action.RESTART" />--> |
| 297 | - </intent-filter> | 297 | +<!-- </intent-filter>--> |
| 298 | - </receiver> | 298 | +<!-- </receiver>--> |
| 299 | 299 | ||
| 300 | <!-- <provider--> | 300 | <!-- <provider--> |
| 301 | <!-- android:name=".utils.WarplyProvider"--> | 301 | <!-- android:name=".utils.WarplyProvider"--> | ... | ... |
| ... | @@ -1478,10 +1478,10 @@ public class WarplyManagerHelper { | ... | @@ -1478,10 +1478,10 @@ public class WarplyManagerHelper { |
| 1478 | } | 1478 | } |
| 1479 | 1479 | ||
| 1480 | public static void logoutUser() { | 1480 | public static void logoutUser() { |
| 1481 | - if (isMyServiceRunning(WarplyHealthService.class)) { | 1481 | +// if (isMyServiceRunning(WarplyHealthService.class)) { |
| 1482 | - Intent stepsServiceIntent = new Intent(Warply.getWarplyContext(), WarplyHealthService.class); | 1482 | +// Intent stepsServiceIntent = new Intent(Warply.getWarplyContext(), WarplyHealthService.class); |
| 1483 | - Warply.getWarplyContext().stopService(stepsServiceIntent); | 1483 | +// Warply.getWarplyContext().stopService(stepsServiceIntent); |
| 1484 | - } | 1484 | +// } |
| 1485 | } | 1485 | } |
| 1486 | 1486 | ||
| 1487 | private static boolean isMyServiceRunning(Class<?> serviceClass) { | 1487 | private static boolean isMyServiceRunning(Class<?> serviceClass) { | ... | ... |
This diff is collapsed. Click to expand it.
| ... | @@ -425,12 +425,12 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { | ... | @@ -425,12 +425,12 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { |
| 425 | if (!EventBus.getDefault().isRegistered(this)) | 425 | if (!EventBus.getDefault().isRegistered(this)) |
| 426 | EventBus.getDefault().register(this); | 426 | EventBus.getDefault().register(this); |
| 427 | 427 | ||
| 428 | - if (mWebviewLoaded) { | 428 | +// if (mWebviewLoaded) { |
| 429 | - String scriptSourceInit = "webviewDidFocus(" + String.valueOf(mWebviewLoaded) + "," + String.valueOf(isMyServiceRunning(WarplyHealthService.class)) + ");"; | 429 | +// String scriptSourceInit = "webviewDidFocus(" + String.valueOf(mWebviewLoaded) + "," + String.valueOf(isMyServiceRunning(WarplyHealthService.class)) + ");"; |
| 430 | - WarpView.this.evaluateJavascript(scriptSourceInit, s -> { | 430 | +// WarpView.this.evaluateJavascript(scriptSourceInit, s -> { |
| 431 | - | 431 | +// |
| 432 | - }); | 432 | +// }); |
| 433 | - } | 433 | +// } |
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | @Override | 436 | @Override |
| ... | @@ -561,9 +561,9 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { | ... | @@ -561,9 +561,9 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { |
| 561 | // EventBus.getDefault().post(new WarplyEventBusManager(pacingVisible)); | 561 | // EventBus.getDefault().post(new WarplyEventBusManager(pacingVisible)); |
| 562 | // } | 562 | // } |
| 563 | 563 | ||
| 564 | - WarplyHealthEventModel healthActive = new WarplyHealthEventModel(); | 564 | +// WarplyHealthEventModel healthActive = new WarplyHealthEventModel(); |
| 565 | - healthActive.setActivated(true); | 565 | +// healthActive.setActivated(true); |
| 566 | - EventBus.getDefault().post(new WarplyEventBusManager(healthActive)); | 566 | +// EventBus.getDefault().post(new WarplyEventBusManager(healthActive)); |
| 567 | } else if (parts[1].equals("steps") && parts[2].equals("shortcutDisabled")) { // This is for the pacing service | 567 | } else if (parts[1].equals("steps") && parts[2].equals("shortcutDisabled")) { // This is for the pacing service |
| 568 | // Intent stepsServiceIntent = new Intent(Warply.getWarplyContext(), WarplyHealthService.class); | 568 | // Intent stepsServiceIntent = new Intent(Warply.getWarplyContext(), WarplyHealthService.class); |
| 569 | // Warply.getWarplyContext().stopService(stepsServiceIntent); | 569 | // Warply.getWarplyContext().stopService(stepsServiceIntent); |
| ... | @@ -572,9 +572,9 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { | ... | @@ -572,9 +572,9 @@ public class WarpView extends WebView implements DefaultLifecycleObserver { |
| 572 | // pacingVisible.setVisible(false); | 572 | // pacingVisible.setVisible(false); |
| 573 | // EventBus.getDefault().post(new WarplyEventBusManager(pacingVisible)); | 573 | // EventBus.getDefault().post(new WarplyEventBusManager(pacingVisible)); |
| 574 | 574 | ||
| 575 | - WarplyHealthEventModel healthActive = new WarplyHealthEventModel(); | 575 | +// WarplyHealthEventModel healthActive = new WarplyHealthEventModel(); |
| 576 | - healthActive.setActivated(false); | 576 | +// healthActive.setActivated(false); |
| 577 | - EventBus.getDefault().post(new WarplyEventBusManager(healthActive)); | 577 | +// EventBus.getDefault().post(new WarplyEventBusManager(healthActive)); |
| 578 | } else if (parts[1].equals("request") || parts[1].equals("response")) { | 578 | } else if (parts[1].equals("request") || parts[1].equals("response")) { |
| 579 | WarpUtils.log("**************** WARPLY Webview Log START *****************"); | 579 | WarpUtils.log("**************** WARPLY Webview Log START *****************"); |
| 580 | WarpUtils.log(message); | 580 | WarpUtils.log(message); | ... | ... |
-
Please register or login to post a comment