Remove Controller interface
This is just useless as is.
Change-Id: I957ea3bda4097ccb8d730943639cd5e74b1b2440
diff --git a/src/org/lineageos/updater/UpdatesActivity.java b/src/org/lineageos/updater/UpdatesActivity.java
index 6b44885..fc3e78b 100644
--- a/src/org/lineageos/updater/UpdatesActivity.java
+++ b/src/org/lineageos/updater/UpdatesActivity.java
@@ -49,7 +49,6 @@
import android.widget.TextView;
import org.json.JSONException;
-import org.lineageos.updater.controller.Controller;
import org.lineageos.updater.controller.UpdaterController;
import org.lineageos.updater.controller.UpdaterService;
import org.lineageos.updater.download.DownloadClient;
@@ -238,7 +237,7 @@
private void loadUpdatesList(File jsonFile, boolean manualRefresh)
throws IOException, JSONException {
Log.d(TAG, "Adding remote updates");
- Controller controller = mUpdaterService.getUpdaterController();
+ UpdaterController controller = mUpdaterService.getUpdaterController();
boolean newUpdates = false;
List<UpdateInfo> updates = Utils.parseJson(jsonFile, true);
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 37b0f94..9d8a854 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -40,7 +40,7 @@
import android.widget.ProgressBar;
import android.widget.TextView;
-import org.lineageos.updater.controller.Controller;
+import org.lineageos.updater.controller.UpdaterController;
import org.lineageos.updater.controller.UpdaterService;
import org.lineageos.updater.misc.BuildInfoUtils;
import org.lineageos.updater.misc.Constants;
@@ -64,7 +64,7 @@
private List<String> mDownloadIds;
private String mSelectedDownload;
- private Controller mUpdaterController;
+ private UpdaterController mUpdaterController;
private UpdatesListActivity mActivity;
private enum Action {
@@ -115,7 +115,7 @@
return new ViewHolder(view);
}
- public void setUpdaterController(Controller updaterController) {
+ public void setUpdaterController(UpdaterController updaterController) {
mUpdaterController = updaterController;
notifyDataSetChanged();
}
diff --git a/src/org/lineageos/updater/controller/Controller.java b/src/org/lineageos/updater/controller/Controller.java
deleted file mode 100644
index fb6df39..0000000
--- a/src/org/lineageos/updater/controller/Controller.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2017 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.lineageos.updater.controller;
-
-import org.lineageos.updater.model.UpdateInfo;
-
-import java.util.List;
-import java.util.Set;
-
-public interface Controller {
-
- boolean addUpdate(UpdateInfo update);
-
- List<UpdateInfo> getUpdates();
-
- Set<String> getIds();
-
- UpdateInfo getUpdate(String downloadId);
-
- void setUpdatesAvailableOnline(List<String> downloadIds, boolean purgeList);
-
- void setUpdatesNotAvailableOnline(List<String> downloadIds);
-
- boolean startDownload(String downloadId);
-
- boolean pauseDownload(String downloadId);
-
- boolean deleteUpdate(String downloadId);
-
- boolean resumeDownload(String downloadId);
-
- boolean isDownloading(String downloadId);
-
- boolean hasActiveDownloads();
-
- boolean isVerifyingUpdate(String downloadId);
-
- boolean isVerifyingUpdate();
-
- boolean isInstallingUpdate(String downloadId);
-
- boolean isInstallingUpdate();
-
- boolean isInstallingABUpdate();
-}
diff --git a/src/org/lineageos/updater/controller/UpdaterController.java b/src/org/lineageos/updater/controller/UpdaterController.java
index faa7306..12b02dd 100644
--- a/src/org/lineageos/updater/controller/UpdaterController.java
+++ b/src/org/lineageos/updater/controller/UpdaterController.java
@@ -39,7 +39,7 @@
import java.util.Map;
import java.util.Set;
-public class UpdaterController implements Controller {
+public class UpdaterController {
public static final String ACTION_DOWNLOAD_PROGRESS = "action_download_progress";
public static final String ACTION_INSTALL_PROGRESS = "action_install_progress";
@@ -292,7 +292,6 @@
return true;
}
- @Override
public void setUpdatesNotAvailableOnline(List<String> downloadIds) {
for (String downloadId : downloadIds) {
DownloadEntry update = mDownloads.get(downloadId);
@@ -302,7 +301,6 @@
}
}
- @Override
public void setUpdatesAvailableOnline(List<String> downloadIds, boolean purgeList) {
List<String> toRemove = new ArrayList<>();
for (DownloadEntry entry : mDownloads.values()) {
@@ -320,7 +318,6 @@
}
}
- @Override
public boolean addUpdate(UpdateInfo update) {
return addUpdate(update, true);
}
@@ -346,7 +343,6 @@
return true;
}
- @Override
public boolean startDownload(String downloadId) {
Log.d(TAG, "Starting " + downloadId);
if (!mDownloads.containsKey(downloadId) || isDownloading(downloadId)) {
@@ -382,7 +378,6 @@
return true;
}
- @Override
public boolean resumeDownload(String downloadId) {
Log.d(TAG, "Resuming " + downloadId);
if (!mDownloads.containsKey(downloadId) || isDownloading(downloadId)) {
@@ -426,7 +421,6 @@
return true;
}
- @Override
public boolean pauseDownload(String downloadId) {
Log.d(TAG, "Pausing " + downloadId);
if (!isDownloading(downloadId)) {
@@ -453,7 +447,6 @@
}).start();
}
- @Override
public boolean deleteUpdate(String downloadId) {
Log.d(TAG, "Cancelling " + downloadId);
if (!mDownloads.containsKey(downloadId) || isDownloading(downloadId)) {
@@ -476,12 +469,10 @@
return true;
}
- @Override
public Set<String> getIds() {
return mDownloads.keySet();
}
- @Override
public List<UpdateInfo> getUpdates() {
List<UpdateInfo> updates = new ArrayList<>();
for (DownloadEntry entry : mDownloads.values()) {
@@ -490,7 +481,6 @@
return updates;
}
- @Override
public UpdateInfo getUpdate(String downloadId) {
DownloadEntry entry = mDownloads.get(downloadId);
return entry != null ? entry.mUpdate : null;
@@ -501,41 +491,38 @@
return entry != null ? entry.mUpdate : null;
}
- @Override
public boolean isDownloading(String downloadId) {
return mDownloads.containsKey(downloadId) &&
mDownloads.get(downloadId).mDownloadClient != null;
}
- @Override
public boolean hasActiveDownloads() {
return mActiveDownloads > 0;
}
- @Override
public boolean isVerifyingUpdate() {
return mVerifyingUpdates.size() > 0;
}
- @Override
public boolean isVerifyingUpdate(String downloadId) {
return mVerifyingUpdates.contains(downloadId);
}
- @Override
public boolean isInstallingUpdate() {
return UpdateInstaller.isInstalling() ||
ABUpdateInstaller.isInstallingUpdate(mContext);
}
- @Override
public boolean isInstallingUpdate(String downloadId) {
return UpdateInstaller.isInstalling(downloadId) ||
ABUpdateInstaller.isInstallingUpdate(mContext, downloadId);
}
- @Override
public boolean isInstallingABUpdate() {
return ABUpdateInstaller.isInstallingUpdate(mContext);
}
+
+ public boolean isWaitingForReboot(String downloadId) {
+ return ABUpdateInstaller.isWaitingForReboot(mContext, downloadId);
+ }
}
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index 3966bb9..3faf710 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -214,7 +214,7 @@
return ABUpdateInstaller.isInstallingUpdate(this) ? START_STICKY : START_NOT_STICKY;
}
- public Controller getUpdaterController() {
+ public UpdaterController getUpdaterController() {
return mUpdaterController;
}