Remove some more download workout related

Remove unused imports
jonasoreland · Oct 2, 2021 · 22b4e55 · 22b4e55
1 parent b74b272
commit 22b4e55
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 66 deletions.
diff --git a/app/src/main/org/runnerup/view/HRSettingsActivity.java b/app/src/main/org/runnerup/view/HRSettingsActivity.java
@@ -46,7 +46,6 @@
 
 import com.jjoe64.graphview.DefaultLabelFormatter;
 import com.jjoe64.graphview.GraphView;
-import com.jjoe64.graphview.Viewport;
 import com.jjoe64.graphview.series.DataPoint;
 import com.jjoe64.graphview.series.LineGraphSeries;
 

diff --git a/app/src/main/org/runnerup/view/ManageWorkoutsActivity.java b/app/src/main/org/runnerup/view/ManageWorkoutsActivity.java
@@ -91,7 +91,6 @@ public class ManageWorkoutsActivity extends AppCompatActivity implements Constan
 
     private boolean uploading = false;
     private CompoundButton currentlySelectedWorkout = null;
-    private Button downloadButton = null;
     private Button deleteButton = null;
     private Button shareButton = null;
     private Button editButton = null;
@@ -115,10 +114,6 @@ public void onCreate(Bundle savedInstanceState) {
         ExpandableListView list = findViewById(R.id.expandable_list_view);
         list.setAdapter(adapter);
 
-        downloadButton = findViewById(R.id.download_workout_button);
-        downloadButton.setOnClickListener(downloadButtonClick);
-        // No download provider currently exists
-        downloadButton.setVisibility(View.GONE);
         deleteButton = findViewById(R.id.delete_workout_button);
         deleteButton.setOnClickListener(deleteButtonClick);
         createButton = findViewById(R.id.create_workout_button);
@@ -283,7 +278,6 @@ protected void onResume() {
 
     private void handleButtons() {
         if (currentlySelectedWorkout == null) {
-            downloadButton.setEnabled(false);
             deleteButton.setEnabled(false);
             shareButton.setEnabled(false);
             editButton.setEnabled(false);
@@ -293,12 +287,10 @@ private void handleButtons() {
 
         WorkoutRef selected = (WorkoutRef) currentlySelectedWorkout.getTag();
         if (PHONE_STRING.contentEquals(selected.synchronizer)) {
-            downloadButton.setEnabled(false);
             deleteButton.setEnabled(true);
             shareButton.setEnabled(true);
             editButton.setEnabled(true);
         } else {
-            downloadButton.setEnabled(true);
             deleteButton.setEnabled(false);
             shareButton.setEnabled(false);
             editButton.setEnabled(false);
@@ -424,58 +416,6 @@ private ArrayList<SyncManager.WorkoutRef> filter(List<SyncManager.WorkoutRef> li
                 .show();
     };
 
-    private final OnClickListener downloadButtonClick = new OnClickListener() {
-
-        @Override
-        public void onClick(View v) {
-            if (currentlySelectedWorkout == null)
-                return;
-
-            final WorkoutRef selected = (WorkoutRef) currentlySelectedWorkout.getTag();
-            ArrayList<WorkoutRef> local = workouts.get(PHONE_STRING);
-            if (contains(local, selected)) {
-                new AlertDialog.Builder(ManageWorkoutsActivity.this)
-                        .setTitle(getString(R.string.Downloading_1s_will_overwrite_2_workout_with_same_name, selected.workoutName, PHONE_STRING))
-                        .setMessage(R.string.Are_you_sure)
-                        .setPositiveButton(R.string.Yes,
-                                (dialog, which) -> {
-                                    dialog.dismiss();
-                                    downloadWorkout(selected);
-                                })
-                        .setNegativeButton(R.string.No,
-                                // Do nothing but close the dialog
-                                (dialog, which) -> dialog.dismiss()
-                        )
-                        .show();
-                return;
-            }
-
-            downloadWorkout(selected);
-        }
-
-        private void downloadWorkout(WorkoutRef selected) {
-            uploading = true;
-            HashSet<WorkoutRef> list = new HashSet<>();
-            list.add((WorkoutRef) currentlySelectedWorkout.getTag());
-            syncManager.loadWorkouts(list, (synchronizerName, status) -> {
-                uploading = false;
-                currentlySelectedWorkout = null;
-                listLocal();
-                handleButtons();
-            });
-        }
-
-        private boolean contains(ArrayList<WorkoutRef> local,
-                                 WorkoutRef selected) {
-            for (WorkoutRef w : local) {
-                if (selected.workoutName.contentEquals(w.workoutName)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-    };
-
     private final OnClickListener deleteButtonClick = v -> {
         if (currentlySelectedWorkout == null)
             return;

diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -152,7 +152,7 @@
   <string name="Cancellingplease_wait">Cancelling, please wait…</string>
   <string name="Are_you_sure">Are you sure?</string>
   <string name="Configure_audio_cues">Configure audio cues</string>
-  <string name="Downloadeditremove_workouts">Download/edit/remove workouts</string>
+  <string name="Downloadeditremove_workouts">Edit workouts</string>
   <string name="Note_you_need_to_connect_to_the_account_too">You must connect to a RunnerUp Live account</string>
   <string name="Use_your_headset_to_startpauseresume_RunnerUp">Use your headset to start/pause/resume RunnerUp</string>
   <string name="Convert_reststep_with_type_distance_to_recoverystep_for_Intervaltab">On the Interval tab, use Recovery instead of Rest (pause) steps</string>
@@ -283,7 +283,6 @@
   <string name="Overwrite_existing">Overwrite existing</string>
   <string name="Create_new_workout">Create new workout</string>
   <string name="Set_workout_name">Set workout name</string>
-  <string name="Downloading_1s_will_overwrite_2_workout_with_same_name">Downloading %1$s will overwrite %2$s workout with same name</string>
   <string name="Delete_workout">Delete workout</string>
   <string name="RunnerUp_workout">RunnerUp workout</string>
   <string name="HinHere_is_a_workout_I_think_you_might_like">Hi\nI think you might like this workout.</string>

diff --git a/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java b/hrdevice/src/org/runnerup/hr/AndroidBLEHRProvider.java
@@ -37,7 +37,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.UUID;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**

diff --git a/hrdevice/src/org/runnerup/hr/BtHRBase.java b/hrdevice/src/org/runnerup/hr/BtHRBase.java
@@ -20,7 +20,6 @@
 import android.os.Looper;
 
 import java.util.UUID;
-import java.util.regex.Pattern;
 
 abstract class BtHRBase implements HRProvider {
     static final UUID HRP_SERVICE = UUID

diff --git a/wear/src/main/java/org/runnerup/view/SearchingFragment.java b/wear/src/main/java/org/runnerup/view/SearchingFragment.java
@@ -18,7 +18,6 @@
 
 import android.app.Fragment;
 import android.graphics.drawable.AnimationDrawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.wearable.view.CircledImageView;
 import android.view.LayoutInflater;