luv090909/FitoTrack
1
0
Fork 0
mirror of https://github.com/russok/FitoTrack.git synced 2025-10-28 16:22:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: handle if OSM-OAuth key isn't valid andmore

Browse Source
This commit is contained in:
jannis 2020-01-03 15:06:50 +01:00
parent f5d2093402
commit 3a0c38fdb4
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/de/tadris/fitness/osm/OsmTraceUploader.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de> * Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
* *
* This file is part of FitoTrack * This file is part of FitoTrack
* *
@ -24,6 +24,8 @@ import android.os.Handler;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.StringRes;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Date; import java.util.Date;
@ -34,6 +36,7 @@ import de.tadris.fitness.data.Workout;
import de.tadris.fitness.data.WorkoutSample; import de.tadris.fitness.data.WorkoutSample;
import de.tadris.fitness.view.ProgressDialogController; import de.tadris.fitness.view.ProgressDialogController;
import de.westnordost.osmapi.OsmConnection; import de.westnordost.osmapi.OsmConnection;
import de.westnordost.osmapi.common.errors.OsmAuthorizationException;
import de.westnordost.osmapi.traces.GpsTraceDetails; import de.westnordost.osmapi.traces.GpsTraceDetails;
import de.westnordost.osmapi.traces.GpsTracesDao; import de.westnordost.osmapi.traces.GpsTracesDao;
import de.westnordost.osmapi.traces.GpsTrackpoint; import de.westnordost.osmapi.traces.GpsTrackpoint;
@ -85,12 +88,15 @@ public class OsmTraceUploader {
public void upload(){ public void upload(){
new Thread(() -> { new Thread(() -> {
try{ try {
executeTask(); executeTask();
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
handler.post(() -> { handler.post(() -> {
Toast.makeText(activity, R.string.uploadFailed, Toast.LENGTH_LONG).show(); @StringRes int textRes= e instanceof OsmAuthorizationException ?
R.string.uploadFailedOsmNotAuthorized : R.string.uploadFailed;
Toast.makeText(activity, textRes, Toast.LENGTH_LONG).show();
dialogController.cancel(); dialogController.cancel();
}); });
} }

3
app/src/main/res/values/strings.xml
View File

@ -1,5 +1,5 @@
<!-- <!--
~ Copyright (c) 2019 Jannis Scheibe <jannis@tadris.de> ~ Copyright (c) 2020 Jannis Scheibe <jannis@tadris.de>
~ ~
~ This file is part of FitoTrack ~ This file is part of FitoTrack
~ ~
@ -68,6 +68,7 @@
<string name="upload">Upload</string> <string name="upload">Upload</string>
<string name="uploadSuccessful">Upload Successful</string> <string name="uploadSuccessful">Upload Successful</string>
<string name="uploadFailed">Upload Failed</string> <string name="uploadFailed">Upload Failed</string>
<string name="uploadFailedOsmNotAuthorized">Not authorized, try again</string>
<string name="workoutAscent">Ascent</string> <string name="workoutAscent">Ascent</string>
<string name="workoutDescent">Descent</string> <string name="workoutDescent">Descent</string>