Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3187ca6e authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Fix #750 Split up NoteSQLiteOpenHelper

parent 28a6288b
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -25,14 +25,14 @@ import it.niedermann.owncloud.notes.android.activity.NotesListViewActivity;
import it.niedermann.owncloud.notes.android.fragment.AccountChooserDialogFragment;
import it.niedermann.owncloud.notes.model.DBNote;
import it.niedermann.owncloud.notes.model.ItemAdapter;
import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
import it.niedermann.owncloud.notes.persistence.NotesDatabase;
import it.niedermann.owncloud.notes.persistence.NoteServerSyncHelper.ViewProvider;

public class MultiSelectedActionModeCallback implements Callback {

    private final Context context;
    private final ViewProvider viewProvider;
    private final NoteSQLiteOpenHelper db;
    private final NotesDatabase db;
    private final ItemAdapter adapter;
    private final RecyclerView recyclerView;
    private final Runnable refreshLists;
@@ -40,7 +40,7 @@ public class MultiSelectedActionModeCallback implements Callback {
    private final SearchView searchView;

    public MultiSelectedActionModeCallback(
            Context context, ViewProvider viewProvider, NoteSQLiteOpenHelper db, ActionMode actionMode, ItemAdapter adapter, RecyclerView recyclerView, Runnable refreshLists, FragmentManager fragmentManager, SearchView searchView) {
            Context context, ViewProvider viewProvider, NotesDatabase db, ActionMode actionMode, ItemAdapter adapter, RecyclerView recyclerView, Runnable refreshLists, FragmentManager fragmentManager, SearchView searchView) {
        this.context = context;
        this.viewProvider = viewProvider;
        this.db = db;
+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ import it.niedermann.owncloud.notes.R;
import it.niedermann.owncloud.notes.model.DBNote;
import it.niedermann.owncloud.notes.model.ISyncCallback;
import it.niedermann.owncloud.notes.model.ItemAdapter;
import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
import it.niedermann.owncloud.notes.persistence.NotesDatabase;
import it.niedermann.owncloud.notes.persistence.NoteServerSyncHelper.ViewProvider;

public class NotesListViewItemTouchHelper extends ItemTouchHelper {
@@ -27,7 +27,7 @@ public class NotesListViewItemTouchHelper extends ItemTouchHelper {
            SingleSignOnAccount ssoAccount,
            Context context,
            ViewProvider viewProvider,
            NoteSQLiteOpenHelper db,
            NotesDatabase db,
            ItemAdapter adapter,
            ISyncCallback syncCallBack,
            Runnable refreshLists
+4 −4
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ import it.niedermann.owncloud.notes.model.NavigationAdapter;
import it.niedermann.owncloud.notes.model.NavigationAdapter.NavigationItem;
import it.niedermann.owncloud.notes.persistence.LoadNotesListTask;
import it.niedermann.owncloud.notes.persistence.LoadNotesListTask.NotesLoadedListener;
import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
import it.niedermann.owncloud.notes.persistence.NotesDatabase;
import it.niedermann.owncloud.notes.persistence.NoteServerSyncHelper;
import it.niedermann.owncloud.notes.util.NoteUtil;

@@ -140,7 +140,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
    private Category navigationSelection = new Category(null, null);
    private String navigationOpen = "";
    private ActionMode mActionMode;
    private NoteSQLiteOpenHelper db = null;
    private NotesDatabase db = null;
    private SearchView searchView = null;
    private final ISyncCallback syncCallBack = () -> {
        adapter.clearSelection(listView);
@@ -174,7 +174,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
            categoryAdapterSelectedItem = savedInstanceState.getString(SAVED_STATE_NAVIGATION_ADAPTER_SLECTION);
        }

        db = NoteSQLiteOpenHelper.getInstance(this);
        db = NotesDatabase.getInstance(this);

        setupHeader();
        setupActionBar();
@@ -770,7 +770,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
    @Override
    public void onNoteFavoriteClick(int position, View view) {
        DBNote note = (DBNote) adapter.getItem(position);
        NoteSQLiteOpenHelper db = NoteSQLiteOpenHelper.getInstance(view.getContext());
        NotesDatabase db = NotesDatabase.getInstance(view.getContext());
        db.toggleFavorite(ssoAccount, note, syncCallBack);
        adapter.notifyItemChanged(position);
        refreshLists();
+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import it.niedermann.owncloud.notes.R;
import it.niedermann.owncloud.notes.android.activity.NotesListViewActivity;
import it.niedermann.owncloud.notes.model.LocalAccount;
import it.niedermann.owncloud.notes.model.NavigationAdapter;
import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
import it.niedermann.owncloud.notes.persistence.NotesDatabase;
import it.niedermann.owncloud.notes.util.Notes;

public class NoteListWidgetConfiguration extends AppCompatActivity {
@@ -40,7 +40,7 @@ public class NoteListWidgetConfiguration extends AppCompatActivity {

    private NavigationAdapter adapterCategories;
    private NavigationAdapter.NavigationItem itemRecent, itemFavorites;
    private NoteSQLiteOpenHelper db = null;
    private NotesDatabase db = null;

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -48,7 +48,7 @@ public class NoteListWidgetConfiguration extends AppCompatActivity {
        setResult(RESULT_CANCELED);
        setContentView(R.layout.activity_note_list_configuration);

        db = NoteSQLiteOpenHelper.getInstance(this);
        db = NotesDatabase.getInstance(this);
        try {
            this.localAccount = db.getLocalAccountByAccountName(SingleAccountHelper.getCurrentSingleSignOnAccount(this).name);
        } catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ import java.util.List;
import it.niedermann.owncloud.notes.R;
import it.niedermann.owncloud.notes.android.activity.EditNoteActivity;
import it.niedermann.owncloud.notes.model.DBNote;
import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper;
import it.niedermann.owncloud.notes.persistence.NotesDatabase;

public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFactory {
    private final Context context;
@@ -23,7 +23,7 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
    private final boolean darkTheme;
    private final String category;
    private final long accountId;
    private NoteSQLiteOpenHelper db;
    private NotesDatabase db;
    private List<DBNote> dbNotes;

    NoteListWidgetFactory(Context context, Intent intent) {
@@ -39,7 +39,7 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact

    @Override
    public void onCreate() {
        db = NoteSQLiteOpenHelper.getInstance(context);
        db = NotesDatabase.getInstance(context);
    }

    @Override
Loading