Renamed DeleteActivity to TrackDeleteActivity.

This commit is contained in:
Dennis Guse
2020-01-03 17:04:51 +01:00
parent 0f72066bc0
commit 7b291e85d7
4 changed files with 8 additions and 9 deletions
+1 -1
View File
@@ -30,7 +30,7 @@ limitations under the License.
<!-- Activities --> <!-- Activities -->
<activity android:name=".AboutActivity" /> <activity android:name=".AboutActivity" />
<activity android:name=".DeleteActivity" /> <activity android:name=".TrackDeleteActivity" />
<activity <activity
android:name=".HelpActivity" android:name=".HelpActivity"
@@ -76,8 +76,8 @@ public abstract class AbstractListActivity extends AbstractActivity implements C
if (stopRecording) { if (stopRecording) {
getTrackRecordingServiceConnection().stopRecording(this, false); getTrackRecordingServiceConnection().stopRecording(this, false);
} }
Intent intent = IntentUtils.newIntent(this, DeleteActivity.class); Intent intent = IntentUtils.newIntent(this, TrackDeleteActivity.class);
intent.putExtra(DeleteActivity.EXTRA_TRACK_IDS, trackIds); intent.putExtra(TrackDeleteActivity.EXTRA_TRACK_IDS, trackIds);
startActivityForResult(intent, DELETE_REQUEST_CODE); startActivityForResult(intent, DELETE_REQUEST_CODE);
} }
@@ -88,7 +88,7 @@ public abstract class AbstractListActivity extends AbstractActivity implements C
abstract protected TrackRecordingServiceConnection getTrackRecordingServiceConnection(); abstract protected TrackRecordingServiceConnection getTrackRecordingServiceConnection();
/** /**
* Called after {@link DeleteActivity} returns its result. * Called after {@link TrackDeleteActivity} returns its result.
*/ */
abstract protected void onDeleted(); abstract protected void onDeleted();
} }
@@ -30,7 +30,7 @@ public class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
private final long[] trackIds; private final long[] trackIds;
private final Context context; private final Context context;
private DeleteActivity deleteActivity; private TrackDeleteActivity deleteActivity;
// true if the AsyncTask has completed // true if the AsyncTask has completed
private boolean completed; private boolean completed;
@@ -41,7 +41,7 @@ public class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
* @param trackIds the track ids to delete. To delete all, set to size 1 with * @param trackIds the track ids to delete. To delete all, set to size 1 with
* trackIds[0] == -1L * trackIds[0] == -1L
*/ */
public DeleteAsyncTask(DeleteActivity deleteActivity, long[] trackIds) { public DeleteAsyncTask(TrackDeleteActivity deleteActivity, long[] trackIds) {
this.deleteActivity = deleteActivity; this.deleteActivity = deleteActivity;
this.trackIds = trackIds; this.trackIds = trackIds;
context = deleteActivity.getApplicationContext(); context = deleteActivity.getApplicationContext();
@@ -53,7 +53,7 @@ public class DeleteAsyncTask extends AsyncTask<Void, Integer, Boolean> {
* *
* @param deleteActivity the current activity, can be null * @param deleteActivity the current activity, can be null
*/ */
public void setActivity(DeleteActivity deleteActivity) { public void setActivity(TrackDeleteActivity deleteActivity) {
this.deleteActivity = deleteActivity; this.deleteActivity = deleteActivity;
if (completed && deleteActivity != null) { if (completed && deleteActivity != null) {
deleteActivity.onAsyncTaskCompleted(); deleteActivity.onAsyncTaskCompleted();
@@ -23,14 +23,13 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import de.dennisguse.opentracks.util.DialogUtils; import de.dennisguse.opentracks.util.DialogUtils;
import de.dennisguse.opentracks.R;
/** /**
* An activity for delete tracks. * An activity for delete tracks.
* *
* @author Jimmy Shih * @author Jimmy Shih
*/ */
public class DeleteActivity extends Activity { public class TrackDeleteActivity extends Activity {
public static final String EXTRA_TRACK_IDS = "track_ids"; public static final String EXTRA_TRACK_IDS = "track_ids";