Skip to content
This repository has been archived by the owner on Jun 14, 2023. It is now read-only.

Commit

Permalink
Avoid Fc if you open setting before connecting to any watch before.
Browse files Browse the repository at this point in the history 
Remove background location permission as request by Google
  • Loading branch information
@fcaronte
fcaronte committed May 21, 2021
1 parent 1dd23ca commit 438b549
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 61 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
applicationId 'com.edotassi.amazmod'
minSdkVersion 23
targetSdkVersion 29
versionCode 231
versionName "1.2.3"
versionCode 232
versionName "1.2.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
setProperty("archivesBaseName", "AmazMod-$project.name-$versionCode")
}
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/com/edotassi/amazmod/ui/StatsActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,21 +124,21 @@ public void onDismissed(@NonNull SnackProgressBar snackProgressBar, int onDispla
binding.activityStatsLogsContent.setMovementMethod(new ScrollingMovementMethod());
binding.activityStatsRootLayout.setOnTouchListener((v, event) -> {
binding.activityStatsLogsContent.getParent().requestDisallowInterceptTouchEvent(false);
binding.activityStatsLocationLogs.getParent().requestDisallowInterceptTouchEvent(false);
//binding.activityStatsLocationLogs.getParent().requestDisallowInterceptTouchEvent(false);
return false;
});

binding.activityStatsLogsContent.setOnTouchListener((v, event) -> {
binding.activityStatsLogsContent.getParent().requestDisallowInterceptTouchEvent(true);
return false;
});

/*
binding.activityStatsLocationLogs.setMovementMethod(new ScrollingMovementMethod());
binding.activityStatsLocationLogs.setOnTouchListener((v, event) -> {
binding.activityStatsLocationLogs.getParent().requestDisallowInterceptTouchEvent(true);
return false;
});

*/
binding.activityStatsOpenNotificationsLog.setOnClickListener(v -> {
startActivity(new Intent(this, NotificationsLogActivity.class));
});
Expand Down Expand Up @@ -170,7 +170,7 @@ public void onResume() {

loadStats();
loadLogs();
loadLocationLogs();
//loadLocationLogs();
}

private void sendLogs() {
Expand Down Expand Up @@ -226,7 +226,7 @@ private void loadLogs() {
Logger.error("error reading log file");

}

/*
private void loadLocationLogs() {
// Retrieve saved location data [milliseconds, latitude, longitude, watch_status]
Set<String> saved_data = Prefs.getStringSet(Constants.PREF_LOCATION_GPS_DATA, null);
Expand All @@ -244,7 +244,7 @@ private void loadLocationLogs() {
binding.activityStatsLocationLogs.setText(log);
binding.activityStatsLocationLogs.setMovementMethod(new ScrollingMovementMethod());
}

*/
@SuppressLint("CheckResult")
private void loadStats() {
binding.activityStatsProgress.setVisibility(View.VISIBLE);
Expand Down
106 changes: 53 additions & 53 deletions app/src/main/res/layout/activity_stats.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,62 +249,62 @@
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.cardview.widget.CardView>

<androidx.cardview.widget.CardView
android:id="@+id/card_gps"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/card_logs">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<ImageView
android:id="@+id/imageView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:contentDescription="@string/image_description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_wifi_tethering_white_24dp" />

<TextView
android:id="@+id/txtGPSTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="@string/location_tracker"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/imageView6"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/activity_stats_location_logs"
android:layout_width="match_parent"
<!--
<androidx.cardview.widget.CardView
android:id="@+id/card_gps"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_marginBottom="8dp"
android:gravity="bottom"
android:scrollbars="vertical"
android:lines="16"
android:textSize="11sp"
app:cardCornerRadius="4dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/txtGPSTitle" />
app:layout_constraintTop_toBottomOf="@id/card_logs">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/imageView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:contentDescription="@string/image_description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_wifi_tethering_white_24dp" />
<TextView
android:id="@+id/txtGPSTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:text="@string/location_tracker"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/imageView6"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/activity_stats_location_logs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_marginBottom="8dp"
android:gravity="bottom"
android:scrollbars="vertical"
android:lines="16"
android:textSize="11sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/txtGPSTitle" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
-->
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.cardview.widget.CardView>

</androidx.constraintlayout.widget.ConstraintLayout>

</ScrollView>
</ScrollView>
7 changes: 7 additions & 0 deletions app/src/main/res/raw/changelog.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<changelog>
<release
date="2021-05-21"
versionCode="232"
versionName="v1.2.4">
<new>Removing background location access in accordance to latest Google Policy guidelines</new>
<bugfix>Bugfixes</bugfix>
</release>
<release
date="2020-09-20"
versionCode="231"
Expand Down

0 comments on commit 438b549

Please sign in to comment.