Rename UpdaterControllerInt to Controller

This commit is contained in:
Gabriele M
2017-07-18 22:23:41 +02:00
parent 009f41cc90
commit 821efd8219
5 changed files with 8 additions and 8 deletions

View File

@@ -46,7 +46,7 @@ import android.widget.TextView;
import org.json.JSONException; import org.json.JSONException;
import org.lineageos.updater.controller.UpdaterController; import org.lineageos.updater.controller.UpdaterController;
import org.lineageos.updater.controller.UpdaterControllerInt; import org.lineageos.updater.controller.Controller;
import org.lineageos.updater.controller.UpdaterService; import org.lineageos.updater.controller.UpdaterService;
import org.lineageos.updater.download.DownloadClient; import org.lineageos.updater.download.DownloadClient;
import org.lineageos.updater.misc.BuildInfoUtils; import org.lineageos.updater.misc.BuildInfoUtils;
@@ -233,7 +233,7 @@ public class UpdatesActivity extends AppCompatActivity {
private void loadUpdatesList(File jsonFile, boolean manualRefresh) private void loadUpdatesList(File jsonFile, boolean manualRefresh)
throws IOException, JSONException { throws IOException, JSONException {
Log.d(TAG, "Adding remote updates"); Log.d(TAG, "Adding remote updates");
UpdaterControllerInt controller = mUpdaterService.getUpdaterController(); Controller controller = mUpdaterService.getUpdaterController();
boolean newUpdates = false; boolean newUpdates = false;
List<UpdateDownload> updates = Utils.parseJson(jsonFile, true); List<UpdateDownload> updates = Utils.parseJson(jsonFile, true);

View File

@@ -30,7 +30,7 @@ import android.widget.ImageButton;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import org.lineageos.updater.controller.UpdaterControllerInt; import org.lineageos.updater.controller.Controller;
import org.lineageos.updater.misc.BuildInfoUtils; import org.lineageos.updater.misc.BuildInfoUtils;
import org.lineageos.updater.misc.StringGenerator; import org.lineageos.updater.misc.StringGenerator;
import org.lineageos.updater.misc.Utils; import org.lineageos.updater.misc.Utils;
@@ -49,7 +49,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
private final float mAlphaDisabledValue; private final float mAlphaDisabledValue;
private List<String> mDownloadIds; private List<String> mDownloadIds;
private UpdaterControllerInt mUpdaterController; private Controller mUpdaterController;
private Context mContext; private Context mContext;
private View mContainerView; private View mContainerView;
@@ -105,7 +105,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter<UpdatesListAdapter.
return new ViewHolder(view); return new ViewHolder(view);
} }
public void setUpdaterController(UpdaterControllerInt updaterController) { public void setUpdaterController(Controller updaterController) {
mUpdaterController = updaterController; mUpdaterController = updaterController;
notifyDataSetChanged(); notifyDataSetChanged();
} }

View File

@@ -20,7 +20,7 @@ import org.lineageos.updater.model.UpdateDownload;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
public interface UpdaterControllerInt { public interface Controller {
boolean addUpdate(UpdateDownload update); boolean addUpdate(UpdateDownload update);

View File

@@ -37,7 +37,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
public class UpdaterController implements UpdaterControllerInt { public class UpdaterController implements Controller {
public static final String ACTION_DOWNLOAD_PROGRESS = "action_download_progress"; public static final String ACTION_DOWNLOAD_PROGRESS = "action_download_progress";
public static final String ACTION_INSTALL_PROGRESS = "action_install_progress"; public static final String ACTION_INSTALL_PROGRESS = "action_install_progress";

View File

@@ -180,7 +180,7 @@ public class UpdaterService extends Service {
return START_NOT_STICKY; return START_NOT_STICKY;
} }
public UpdaterControllerInt getUpdaterController() { public Controller getUpdaterController() {
return mUpdaterController; return mUpdaterController;
} }