Skip to content

Commit adaa3a2

Browse files
committed
Updated to HyperTrack SDK v4.8.0
1 parent f46bf37 commit adaa3a2

File tree

7 files changed

+12
-144
lines changed

7 files changed

+12
-144
lines changed

.gitignore

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,8 @@ captures/
3636

3737
# IntelliJ
3838
*.iml
39-
.idea/workspace.xml
40-
.idea/tasks.xml
41-
.idea/gradle.xml
42-
.idea/assetWizardSettings.xml
43-
.idea/dictionaries
44-
.idea/libraries
45-
.idea/misc.xml
46-
# Android Studio 3 in .gitignore file.
47-
.idea/caches
48-
.idea/modules.xml
39+
.idea/*
40+
4941
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
5042
.idea/navEditor.xml
5143

.idea/codeStyles/Project.xml

Lines changed: 0 additions & 116 deletions
This file was deleted.

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ configurations.all {
1616
}
1717

1818
android {
19-
compileSdkVersion 29
20-
buildToolsVersion "29.0.3"
19+
compileSdkVersion 30
20+
buildToolsVersion "30.0.2"
2121
defaultConfig {
2222
applicationId "com.hypertrack.live"
2323
minSdkVersion 19
24-
targetSdkVersion 29
24+
targetSdkVersion 30
2525
versionCode project.ext.versionNumber
2626
versionName project.ext.versionName
2727
testInstrumentationRunner
@@ -91,7 +91,7 @@ dependencies {
9191

9292
implementation 'com.amazonaws:aws-android-sdk-mobile-client:2.16.7'
9393

94-
implementation 'com.hypertrack:hypertrack:4.5.3'
94+
implementation 'com.hypertrack:hypertrack:4.8.0'
9595
implementation 'com.hypertrack:hypertrack-views:0.8.6'
9696
implementation 'com.hypertrack:maps-google:0.1.8'
9797
implementation project(':hypertrack-backend')

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
android:required="false" />
2222

2323
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
24-
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
24+
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" tools:node="remove" />
2525

2626
<uses-feature
2727
android:glEsVersion="0x00020000"

app/src/main/java/com/hypertrack/live/LaunchActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
import androidx.annotation.Nullable;
1111
import androidx.appcompat.app.AppCompatActivity;
1212

13+
import com.google.android.gms.maps.model.BitmapDescriptorFactory;
14+
import com.google.android.gms.maps.model.MarkerOptions;
1315
import com.hypertrack.live.auth.ConfirmFragment;
1416
import com.hypertrack.live.auth.SignInFragment;
1517
import com.hypertrack.live.ui.LoaderDecorator;
1618
import com.hypertrack.live.ui.MainActivity;
1719
import com.hypertrack.live.utils.SharedHelper;
20+
import com.hypertrack.maps.google.widget.GoogleMapConfig;
1821

1922
import org.json.JSONObject;
2023

app/src/main/java/com/hypertrack/live/PermissionsManager.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,14 @@ public static boolean isActivityRecognitionPermissionApproved(Context context) {
2525
Manifest.permission.ACTIVITY_RECOGNITION) == PackageManager.PERMISSION_GRANTED;
2626
}
2727

28-
public static boolean isBackgroundLocationPermissionApproved(Context context) {
29-
return android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.Q
30-
|| ContextCompat.checkSelfPermission(context,
31-
Manifest.permission.ACCESS_BACKGROUND_LOCATION) == PackageManager.PERMISSION_GRANTED;
32-
}
33-
3428
public static boolean isAllPermissionsApproved(Context context) {
3529
return isAccessFineLocationPermissionApproved(context)
36-
&& isActivityRecognitionPermissionApproved(context)
37-
&& isBackgroundLocationPermissionApproved(context);
30+
&& isActivityRecognitionPermissionApproved(context);
3831
}
3932

4033
public static void requestPermissions(Activity activity, int requestCode) {
4134
boolean permissionAccessCoarseLocationApproved = isAccessFineLocationPermissionApproved(activity);
4235
boolean permissionActivityRecognitionApproved = isActivityRecognitionPermissionApproved(activity);
43-
boolean permissionBackgroundLocationApproved = isBackgroundLocationPermissionApproved(activity);
4436

4537
List<String> permissions = new ArrayList<>();
4638
if (!permissionAccessCoarseLocationApproved) {
@@ -50,9 +42,6 @@ public static void requestPermissions(Activity activity, int requestCode) {
5042
if (!permissionActivityRecognitionApproved) {
5143
permissions.add(Manifest.permission.ACTIVITY_RECOGNITION);
5244
}
53-
if (!permissionBackgroundLocationApproved) {
54-
permissions.add(Manifest.permission.ACCESS_BACKGROUND_LOCATION);
55-
}
5645
}
5746

5847
ActivityCompat.requestPermissions(activity, permissions.toArray(new String[0]), requestCode);

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ allprojects {
2727

2828
task clean(type: Delete) { delete rootProject.buildDir }
2929

30-
version = "3.9.0"
30+
version = "3.10.0"

0 commit comments

Comments
 (0)