add select all to board add layout

rename runtask methods
uptimize board order call

Clover/app/src/main/java/org/floens/chan/core/database/DatabaseBoardManager.java

@@ -37,7 +37,7 @@ public class DatabaseBoardManager {
         };
     }
 
-    public Callable<Void> update(final Board board) {
+    public Callable<Void> updateIncludingUserFields(final Board board) {
         return () -> {
             helper.boardsDao.update(board);
 
@@ -45,6 +45,18 @@ public class DatabaseBoardManager {
         };
     }
 
+    public Callable<Void> updateOrders(final List<Board> boards, final int fromOrder) {
+        return () -> {
+            for (int i = 0; i < boards.size(); i++) {
+                Board board = boards.get(i);
+                board.order = fromOrder + i;
+                helper.boardsDao.update(board);
+            }
+
+            return null;
+        };
+    }
+
     public Callable<Void> createAll(final List<Board> boards) {
         return () -> {
             // TODO: optimize

Clover/app/src/main/java/org/floens/chan/core/database/DatabaseLoadableManager.java

@@ -94,7 +94,7 @@ public class DatabaseLoadableManager {
         // We only cache THREAD loadables in the db
         if (loadable.isThreadMode()) {
             long start = Time.startTiming();
-            Loadable result = databaseManager.runTaskSync(getLoadable(loadable));
+            Loadable result = databaseManager.runTask(getLoadable(loadable));
             Time.endTiming("get loadable from db " + loadable.boardCode, start);
             return result;
         } else {

Clover/app/src/main/java/org/floens/chan/core/database/DatabaseManager.java

@@ -52,8 +52,8 @@ import de.greenrobot.event.EventBus;
 /**
  * The central point for database related access.<br>
  * <b>All database queries are run on a single database thread</b>, therefor all functions return a
- * {@link Callable} that needs to be queued on either {@link #runTask(Callable)},
+ * {@link Callable} that needs to be queued on either {@link #runTaskAsync(Callable)},
- * {@link #runTask(Callable, TaskResult)} or {@link #runTaskSync(Callable)}.<br>
+ * {@link #runTaskAsync(Callable, TaskResult)} or {@link #runTask(Callable)}.<br>
  * You often want the sync flavour for queries that return data, it waits for the task to be finished on the other thread.<br>
  * Use the async versions when you don't care when the query is done.
  */
@@ -126,7 +126,7 @@ public class DatabaseManager {
     // Called when the app changes foreground state
     public void onEvent(Chan.ForegroundChangedMessage message) {
         if (!message.inForeground) {
-            runTask(databaseLoadableManager.flush());
+            runTaskAsync(databaseLoadableManager.flush());
         }
     }
 
@@ -134,10 +134,10 @@ public class DatabaseManager {
         loadThreadHides();
 
         // Loads data into fields.
-        runTaskSync(databaseSavedReplyManager.load());
+        runTask(databaseSavedReplyManager.load());
 
         // Only trims.
-        runTask(databaseHistoryManager.load());
+        runTaskAsync(databaseHistoryManager.load());
     }
 
     /**
@@ -268,15 +268,15 @@ public class DatabaseManager {
         }
     }
 
-    public <T> void runTask(final Callable<T> taskCallable) {
+    public <T> void runTaskAsync(final Callable<T> taskCallable) {
-        runTask(taskCallable, null);
+        runTaskAsync(taskCallable, null);
     }
 
-    public <T> void runTask(final Callable<T> taskCallable, final TaskResult<T> taskResult) {
+    public <T> void runTaskAsync(final Callable<T> taskCallable, final TaskResult<T> taskResult) {
-        Future<T> f = executeTask(taskCallable, taskResult);
+        executeTask(taskCallable, taskResult);
     }
 
-    public <T> T runTaskSync(final Callable<T> taskCallable) {
+    public <T> T runTask(final Callable<T> taskCallable) {
         try {
             return executeTask(taskCallable, null).get();
         } catch (InterruptedException | ExecutionException e) {

Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java

@@ -64,7 +64,7 @@ public class BoardManager {
     }
 
     public void createAll(List<Board> boards) {
-        databaseManager.runTaskSync(
+        databaseManager.runTask(
                 databaseManager.getDatabaseBoardManager().createAll(boards));
     }
 
@@ -77,17 +77,17 @@ public class BoardManager {
      * @return the board code with the same site and board code, or {@code null} if not found.
      */
     public Board getBoard(Site site, String code) {
-        return databaseManager.runTaskSync(
+        return databaseManager.runTask(
                 databaseManager.getDatabaseBoardManager().getBoard(site, code));
     }
 
     public List<Board> getSiteBoards(Site site) {
-        return databaseManager.runTaskSync(
+        return databaseManager.runTask(
                 databaseManager.getDatabaseBoardManager().getSiteBoards(site));
     }
 
     public List<Board> getSiteSavedBoards(Site site) {
-        List<Board> boards = databaseManager.runTaskSync(
+        List<Board> boards = databaseManager.runTask(
                 databaseManager.getDatabaseBoardManager().getSiteSavedBoards(site));
         Collections.sort(boards, ORDER_SORT);
         return boards;
@@ -107,14 +107,20 @@ public class BoardManager {
 
     public void updateBoardOrder(Board board, int order) {
         board.order = order;
-        // not sync, does not update observable.
+        databaseManager.runTask(databaseManager.getDatabaseBoardManager()
-        databaseManager.runTask(databaseManager.getDatabaseBoardManager().update(board),
+                .updateIncludingUserFields(board));
-                result -> updateSavedBoards());
+        updateSavedBoards();
+    }
+
+    public void updateBoardOrders(List<Board> boards, int fromOrder) {
+        databaseManager.runTask(databaseManager.getDatabaseBoardManager()
+                .updateOrders(boards, fromOrder));
+        updateSavedBoards();
     }
 
     private void setSaved(Board board, boolean saved) {
         board.saved = saved;
-        databaseManager.runTaskSync(databaseManager.getDatabaseBoardManager().update(board));
+        databaseManager.runTask(databaseManager.getDatabaseBoardManager().updateIncludingUserFields(board));
         updateSavedBoards();
     }
 

Clover/app/src/main/java/org/floens/chan/core/manager/FilterEngine.java

@@ -84,15 +84,15 @@ public class FilterEngine {
     }
 
     public void deleteFilter(Filter filter) {
-        databaseManager.runTaskSync(databaseFilterManager.deleteFilter(filter));
+        databaseManager.runTask(databaseFilterManager.deleteFilter(filter));
         update();
     }
 
     public void createOrUpdateFilter(Filter filter) {
         if (filter.id == 0) {
-            databaseManager.runTaskSync(databaseFilterManager.createFilter(filter));
+            databaseManager.runTask(databaseFilterManager.createFilter(filter));
         } else {
-            databaseManager.runTaskSync(databaseFilterManager.updateFilter(filter));
+            databaseManager.runTask(databaseFilterManager.updateFilter(filter));
         }
         update();
     }
@@ -261,7 +261,7 @@ public class FilterEngine {
     }
 
     private void update() {
-        List<Filter> filters = databaseManager.runTaskSync(databaseFilterManager.getFilters());
+        List<Filter> filters = databaseManager.runTask(databaseFilterManager.getFilters());
         List<Filter> enabled = new ArrayList<>();
         for (Filter filter : filters) {
             if (filter.enabled) {

Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java

@@ -141,7 +141,7 @@ public class WatchManager {
         this.chanLoaderFactory = chanLoaderFactory;
 
         databasePinManager = databaseManager.getDatabasePinManager();
-        pins = databaseManager.runTaskSync(databasePinManager.getPins());
+        pins = databaseManager.runTask(databasePinManager.getPins());
         Collections.sort(pins, SORT_PINS);
 
         handler = new Handler(Looper.getMainLooper(), new Handler.Callback() {
@@ -184,7 +184,7 @@ public class WatchManager {
         }
         pins.add(pin);
         applyOrder();
-        databaseManager.runTaskSync(databasePinManager.createPin(pin));
+        databaseManager.runTask(databasePinManager.createPin(pin));
 
         updateState();
 
@@ -198,7 +198,7 @@ public class WatchManager {
 
         destroyPinWatcher(pin);
 
-        databaseManager.runTaskSync(databasePinManager.deletePin(pin));
+        databaseManager.runTask(databasePinManager.deletePin(pin));
         // Update the new orders
         applyOrder();
         updatePinsInDatabase();
@@ -209,7 +209,7 @@ public class WatchManager {
     }
 
     public void updatePin(Pin pin) {
-        databaseManager.runTaskSync(databasePinManager.updatePin(pin));
+        databaseManager.runTask(databasePinManager.updatePin(pin));
 
         updateState();
 
@@ -431,7 +431,7 @@ public class WatchManager {
     }
 
     private void updatePinsInDatabase() {
-        databaseManager.runTask(databasePinManager.updatePins(pins));
+        databaseManager.runTaskAsync(databasePinManager.updatePins(pins));
     }
 
     private Boolean isWatchingSettingEnabled() {

Clover/app/src/main/java/org/floens/chan/core/presenter/BoardSetupPresenter.java

@@ -78,6 +78,14 @@ public class BoardSetupPresenter {
         selectedSuggestions.clear();
     }
 
+    public void onSelectAllClicked() {
+        for (BoardSuggestion suggestion : suggestions) {
+            suggestion.checked = true;
+            selectedSuggestions.add(suggestion.getCode());
+        }
+        addCallback.updateSuggestions();
+    }
+
     public void onSuggestionClicked(BoardSuggestion suggestion) {
         suggestion.checked = !suggestion.checked;
         if (suggestion.checked) {
@@ -134,9 +142,8 @@ public class BoardSetupPresenter {
         Board board = savedBoards.remove(position);
         boardManager.unsaveBoard(board);
 
-        for (int i = position; i < savedBoards.size(); i++) {
+        boardManager.updateBoardOrders(
-            boardManager.updateBoardOrder(savedBoards.get(i), i);
+                savedBoards.subList(position, savedBoards.size()), position);
-        }
 
         updateSavedBoards();
         callback.setSavedBoards(savedBoards);
@@ -152,10 +159,6 @@ public class BoardSetupPresenter {
         callback.setSavedBoards(savedBoards);
     }
 
-    public void done() {
-        callback.finish();
-    }
-
     public void searchEntered(String userQuery) {
         if (suggestionCall != null) {
             suggestionCall.cancel();
@@ -225,8 +228,6 @@ public class BoardSetupPresenter {
 
         void showRemovedSnackbar(Board board);
 
-        void finish();
-
         void boardsWereAdded(int count);
     }
 

Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java

@@ -218,7 +218,7 @@ public class ReplyPresenter implements AuthenticationLayoutCallback, ImagePickDe
 
             SavedReply savedReply = SavedReply.fromSiteBoardNoPassword(
                     loadable.site, loadable.board, replyResponse.postNo, replyResponse.password);
-            databaseManager.runTask(databaseManager.getDatabaseSavedReplyManager()
+            databaseManager.runTaskAsync(databaseManager.getDatabaseSavedReplyManager()
                     .saveReply(savedReply));
 
             switchPage(Page.INPUT, false);

Clover/app/src/main/java/org/floens/chan/core/presenter/SiteSetupPresenter.java

@@ -36,7 +36,7 @@ public class SiteSetupPresenter {
 
     private void setBoardCount(Callback callback, Site site) {
         callback.setBoardCount(
-                databaseManager.runTaskSync(
+                databaseManager.runTask(
                         databaseManager.getDatabaseBoardManager().getSiteSavedBoards(site)
                 ).size()
         );

Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java

@@ -498,7 +498,7 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
             case POST_OPTION_SAVE:
                 SavedReply savedReply = SavedReply.fromSiteBoardNoPassword(
                         post.board.site, post.board, post.no, "");
-                databaseManager.runTask(databaseManager.getDatabaseSavedReplyManager().saveReply(savedReply));
+                databaseManager.runTaskAsync(databaseManager.getDatabaseSavedReplyManager().saveReply(savedReply));
                 break;
             case POST_OPTION_PIN:
                 Loadable pinLoadable = databaseManager.getDatabaseLoadableManager().get(Loadable.forThread(loadable.site, post.board, post.no));
@@ -606,7 +606,7 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
     public void deletePostConfirmed(Post post, boolean onlyImageDelete) {
         threadPresenterCallback.showDeleting();
 
-        SavedReply reply = databaseManager.runTaskSync(
+        SavedReply reply = databaseManager.runTask(
                 databaseManager.getDatabaseSavedReplyManager().findSavedReply(post.board, post.no)
         );
         if (reply != null) {
@@ -634,7 +634,7 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
     }
 
     private void requestDeletePost(Post post) {
-        SavedReply reply = databaseManager.runTaskSync(
+        SavedReply reply = databaseManager.runTask(
                 databaseManager.getDatabaseSavedReplyManager().findSavedReply(post.board, post.no)
         );
         if (reply != null) {
@@ -698,7 +698,7 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
             history.loadable = loadable;
             PostImage image = chanLoader.getThread().op.image;
             history.thumbnailUrl = image == null ? "" : image.thumbnailUrl.toString();
-            databaseManager.runTask(databaseManager.getDatabaseHistoryManager().addHistory(history));
+            databaseManager.runTaskAsync(databaseManager.getDatabaseHistoryManager().addHistory(history));
         }
     }
 

Clover/app/src/main/java/org/floens/chan/core/site/SiteRepository.java

@@ -18,18 +18,18 @@ public class SiteRepository {
     }
 
     public List<SiteModel> all() {
-        return databaseManager.runTaskSync(databaseManager.getDatabaseSiteManager().getAll());
+        return databaseManager.runTask(databaseManager.getDatabaseSiteManager().getAll());
     }
 
     public SiteModel create(SiteConfig config, SiteUserSettings userSettings) {
         SiteModel siteModel = new SiteModel();
         siteModel.storeConfigFields(config, userSettings);
-        databaseManager.runTaskSync(databaseManager.getDatabaseSiteManager().add(siteModel));
+        databaseManager.runTask(databaseManager.getDatabaseSiteManager().add(siteModel));
         return siteModel;
     }
 
     public void setId(SiteModel siteModel, int id) {
-        databaseManager.runTaskSync(databaseManager.getDatabaseSiteManager()
+        databaseManager.runTask(databaseManager.getDatabaseSiteManager()
                 .updateId(siteModel, id));
     }
 }

Clover/app/src/main/java/org/floens/chan/ui/controller/BoardSetupController.java

@@ -127,6 +127,11 @@ public class BoardSetupController extends Controller implements View.OnClickList
         presenter.create(this, site);
     }
 
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
     public void setSite(Site site) {
         this.site = site;
     }
@@ -199,11 +204,6 @@ public class BoardSetupController extends Controller implements View.OnClickList
         snackbar.show();
     }
 
-    @Override
-    public void finish() {
-        navigationController.popController();
-    }
-
     private class SavedBoardsAdapter extends RecyclerView.Adapter<SavedBoardCell> {
         private List<Board> savedBoards;
 

Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java

@@ -242,7 +242,7 @@ public class FiltersController extends Controller implements ToolbarMenuItem.Too
 
         private void load() {
             sourceList.clear();
-            sourceList.addAll(databaseManager.runTaskSync(databaseManager.getDatabaseFilterManager().getFilters()));
+            sourceList.addAll(databaseManager.runTask(databaseManager.getDatabaseFilterManager().getFilters()));
 
             filter();
         }

Clover/app/src/main/java/org/floens/chan/ui/controller/HistoryController.java

@@ -133,7 +133,7 @@ public class HistoryController extends Controller implements CompoundButton.OnCh
                         .setPositiveButton(R.string.history_clear_confirm_button, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                databaseManager.runTask(databaseHistoryManager.clearHistory());
+                                databaseManager.runTaskAsync(databaseHistoryManager.clearHistory());
                                 adapter.load();
                             }
                         })
@@ -146,7 +146,7 @@ public class HistoryController extends Controller implements CompoundButton.OnCh
                         .setPositiveButton(R.string.saved_reply_clear_confirm_button, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                databaseManager.runTask(databaseSavedReplyManager.clearSavedReplies());
+                                databaseManager.runTaskAsync(databaseSavedReplyManager.clearSavedReplies());
                             }
                         })
                         .show();
@@ -166,7 +166,7 @@ public class HistoryController extends Controller implements CompoundButton.OnCh
     }
 
     private void deleteHistory(History history) {
-        databaseManager.runTaskSync(databaseHistoryManager.removeHistory(history));
+        databaseManager.runTask(databaseHistoryManager.removeHistory(history));
         adapter.load();
     }
 
@@ -226,7 +226,7 @@ public class HistoryController extends Controller implements CompoundButton.OnCh
         private void load() {
             if (!resultPending) {
                 resultPending = true;
-                databaseManager.runTask(databaseHistoryManager.getHistory(), this);
+                databaseManager.runTaskAsync(databaseHistoryManager.getHistory(), this);
             }
         }
 

Clover/app/src/main/java/org/floens/chan/ui/layout/BoardAddLayout.java

@@ -25,6 +25,7 @@ import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -35,12 +36,13 @@ import org.floens.chan.core.presenter.BoardSetupPresenter;
 import static org.floens.chan.utils.AndroidUtils.getAttrColor;
 import static org.floens.chan.utils.AndroidUtils.getString;
 
-public class BoardAddLayout extends LinearLayout implements SearchLayout.SearchLayoutCallback, BoardSetupPresenter.AddCallback {
+public class BoardAddLayout extends LinearLayout implements SearchLayout.SearchLayoutCallback, BoardSetupPresenter.AddCallback, View.OnClickListener {
     private BoardSetupPresenter presenter;
 
     private SuggestionsAdapter suggestionsAdapter;
 
     private SearchLayout search;
+    private Button checkAllButton;
     private RecyclerView suggestionsRecycler;
 
     private AlertDialog dialog;
@@ -64,6 +66,7 @@ public class BoardAddLayout extends LinearLayout implements SearchLayout.SearchL
         // View binding
         search = findViewById(R.id.search);
         suggestionsRecycler = findViewById(R.id.suggestions);
+        checkAllButton = (Button) findViewById(R.id.select_all);
 
         // Adapters
         suggestionsAdapter = new SuggestionsAdapter();
@@ -74,6 +77,7 @@ public class BoardAddLayout extends LinearLayout implements SearchLayout.SearchL
         search.setTextColor(getAttrColor(getContext(), R.attr.text_color_primary));
         search.setHintColor(getAttrColor(getContext(), R.attr.text_color_hint));
         search.setClearButtonImage(R.drawable.ic_clear_black_24dp);
+        checkAllButton.setOnClickListener(this);
         suggestionsRecycler.setLayoutManager(new LinearLayoutManager(getContext()));
         suggestionsRecycler.setAdapter(suggestionsAdapter);
 
@@ -92,6 +96,13 @@ public class BoardAddLayout extends LinearLayout implements SearchLayout.SearchL
         presenter.unbindAddDialog();
     }
 
+    @Override
+    public void onClick(View v) {
+        if (v == checkAllButton) {
+            presenter.onSelectAllClicked();
+        }
+    }
+
     @Override
     public void onSearchEntered(String entered) {
         presenter.searchEntered(entered);

Clover/app/src/main/res/layout/layout_board_add.xml

@@ -24,13 +24,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     android:paddingLeft="16dp"
     android:paddingRight="16dp">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
         <org.floens.chan.ui.layout.SearchLayout
             android:id="@+id/search"
-        android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:paddingBottom="8dp"
             android:paddingTop="8dp" />
 
+        <Button
+            android:id="@+id/select_all"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="@string/setup_board_select_all" />
+
+    </LinearLayout>
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/suggestions"
         android:layout_width="match_parent"

Clover/app/src/main/res/values/strings.xml

@@ -189,6 +189,7 @@ Re-enable this permission in the app settings if you permanently disabled it."</
     <string name="setup_board_add">Add board</string>
     <string name="setup_board_removed">Removed \'%s\'</string>
     <string name="setup_board_added">%s added</string>
+    <string name="setup_board_select_all">Select all</string>
 
     <string name="filter_summary_all_boards">all boards</string>
     <string name="filter_enabled">Enabled</string>