diff options
11 files changed, 52 insertions, 47 deletions
diff --git a/app/build.gradle b/app/build.gradle index e5164130..d58fe179 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "it.niedermann.owncloud.notes" minSdkVersion 14 targetSdkVersion 28 - versionCode 58 - versionName "2.2.0" + versionCode 59 + versionName "2.2.1" // vectorDrawables.useSupportLibrary = true } buildTypes { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java index 464f3a21..4e574a75 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java @@ -176,7 +176,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap shortcutManager.addDynamicShortcuts(newShortcuts); } } - }).run(); + }).start(); } @Override @@ -381,11 +381,11 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap adapterCategories.setSelectedItem(item.id); // update current selection - if (itemRecent == item) { + if (itemRecent.equals(item)) { navigationSelection = new Category(null, null); - } else if (itemFavorites == item) { + } else if (itemFavorites.equals(item)) { navigationSelection = new Category(null, true); - } else if (itemUncategorized == item) { + } else if (itemUncategorized.equals(item)) { navigationSelection = new Category("", null); } else { navigationSelection = new Category(item.label, null); @@ -531,16 +531,14 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap NavigationAdapter adapterMenu = new NavigationAdapter(new NavigationAdapter.ClickListener() { @Override public void onItemClick(NavigationAdapter.NavigationItem item) { - if (item == itemSettings) { + if (itemSettings.equals(item)) { Intent settingsIntent = new Intent(getApplicationContext(), PreferencesActivity.class); startActivityForResult(settingsIntent, server_settings); - } else if (item == itemAbout) { + } else if (itemAbout.equals(item)) { Intent aboutIntent = new Intent(getApplicationContext(), AboutActivity.class); startActivityForResult(aboutIntent, about); - } else if (item == itemTrashbin) { - if (localAccount != null) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(localAccount.getUrl() + "/index.php/apps/files/?dir=/&view=trashbin"))); - } + } else if (itemTrashbin.equals(item) && localAccount != null) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(localAccount.getUrl() + "/index.php/apps/files/?dir=/&view=trashbin"))); } } @@ -662,7 +660,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap LoadNotesListTask.NotesLoadedListener callback = (List<Item> notes, boolean showCategory) -> { adapter.setShowCategory(showCategory); adapter.setItemList(notes); - if(notes.size() > 0) { + if (notes.size() > 0) { emptyContentView.setVisibility(View.GONE); } else { emptyContentView.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidget.java b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidget.java index 13049163..a9a477cc 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidget.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidget.java @@ -147,7 +147,7 @@ public class NoteListWidget extends AppWidgetProvider { case NoteListWidget.NLW_DISPLAY_STARRED: return context.getString(R.string.label_favorites); case NoteListWidget.NLW_DISPLAY_CATEGORY: - if (category.equals("")) { + if ("".equals(category)) { return context.getString(R.string.action_uncategorized); } else { return category; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java index 706ac198..e73636ee 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetConfiguration.java @@ -86,9 +86,9 @@ public class NoteListWidgetConfiguration extends AppCompatActivity { public void onItemClick(NavigationAdapter.NavigationItem item) { SharedPreferences.Editor sp = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).edit(); - if (item == itemRecent) { + if (itemRecent.equals(item)) { sp.putInt(NoteListWidget.WIDGET_MODE_KEY + appWidgetId, NoteListWidget.NLW_DISPLAY_ALL); - } else if (item == itemFavorites) { + } else if (itemFavorites.equals(item)) { sp.putInt(NoteListWidget.WIDGET_MODE_KEY + appWidgetId, NoteListWidget.NLW_DISPLAY_STARRED); } else { String category = ""; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetFactory.java index 56477712..95700cd1 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetFactory.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetFactory.java @@ -20,19 +20,17 @@ import it.niedermann.owncloud.notes.persistence.NoteSQLiteOpenHelper; public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFactory { private final Context context; private final int displayMode; - private final int appWidgetId; private final boolean darkTheme; private String category; - private final SharedPreferences sp; private NoteSQLiteOpenHelper db; private List<DBNote> dbNotes; private long accountId; NoteListWidgetFactory(Context context, Intent intent) { this.context = context; - appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, + final int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); - sp = PreferenceManager.getDefaultSharedPreferences(this.context); + final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this.context); displayMode = sp.getInt(NoteListWidget.WIDGET_MODE_KEY + appWidgetId, -1); darkTheme = sp.getBoolean(NoteListWidget.DARK_THEME_KEY + appWidgetId, false); category = sp.getString(NoteListWidget.WIDGET_CATEGORY_KEY + appWidgetId, ""); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java index 9c906849..682fd1be 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java @@ -48,12 +48,6 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo private static final String TAG = BaseNoteFragment.class.getSimpleName(); - public interface NoteFragmentListener { - void close(); - - void onNoteUpdated(DBNote note); - } - private static final int MENU_ID_PIN = -1; public static final String PARAM_NOTE_ID = "noteId"; public static final String PARAM_ACCOUNT_ID = "accountId"; @@ -393,4 +387,10 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo db.setCategory(note, category, null); listener.onNoteUpdated(note); } + + public interface NoteFragmentListener { + void close(); + + void onNoteUpdated(DBNote note); + } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java index ba5faa12..1aa3a542 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java @@ -145,10 +145,12 @@ public class NoteEditFragment extends BaseNoteFragment { .subscribe(new Subscriber<CharSequence>() { @Override public void onCompleted() { + // Nothing to do here } @Override public void onError(Throwable e) { + e.printStackTrace(); } @Override diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java index 0b925b2f..57b5f203 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java @@ -160,7 +160,8 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { @BindView(R.id.noteSwipeable) public View noteSwipeable; View noteSwipeFrame; - ImageView noteFavoriteLeft, noteDeleteRight; + ImageView noteFavoriteLeft; + ImageView noteDeleteRight; TextView noteTitle; @BindView(R.id.noteCategory) TextView noteCategory; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java index f8ad118c..18421c86 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java @@ -44,21 +44,6 @@ public class NoteServerSyncHelper { private static NoteServerSyncHelper instance; - /** - * Get (or create) instance from NoteServerSyncHelper. - * This has to be a singleton in order to realize correct registering and unregistering of - * the BroadcastReceiver, which listens on changes of network connectivity. - * - * @param dbHelper NoteSQLiteOpenHelper - * @return NoteServerSyncHelper - */ - public static synchronized NoteServerSyncHelper getInstance(NoteSQLiteOpenHelper dbHelper) { - if (instance == null) { - instance = new NoteServerSyncHelper(dbHelper); - } - return instance; - } - private NoteSQLiteOpenHelper dbHelper; private Context appContext = null; private LocalAccount localAccount; @@ -118,6 +103,21 @@ public class NoteServerSyncHelper { updateNetworkStatus(); } + /** + * Get (or create) instance from NoteServerSyncHelper. + * This has to be a singleton in order to realize correct registering and unregistering of + * the BroadcastReceiver, which listens on changes of network connectivity. + * + * @param dbHelper NoteSQLiteOpenHelper + * @return NoteServerSyncHelper + */ + public static synchronized NoteServerSyncHelper getInstance(NoteSQLiteOpenHelper dbHelper) { + if (instance == null) { + instance = new NoteServerSyncHelper(dbHelper); + } + return instance; + } + public void updateAccount() throws NextcloudFilesAppAccountNotFoundException { try { this.localAccount = dbHelper.getLocalAccountByAccountName(SingleAccountHelper.getCurrentSingleSignOnAccount(appContext).name); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java index d07669b1..d31c5816 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java @@ -15,10 +15,6 @@ import it.niedermann.owncloud.notes.R; */ public class NoteUtil { - private NoteUtil() { - - } - private static final Pattern pLists = Pattern.compile("^\\s*[*+-]\\s+", Pattern.MULTILINE); private static final Pattern pHeadings = Pattern.compile("^#+\\s+(.*?)\\s*#*$", Pattern.MULTILINE); private static final Pattern pHeadingLine = Pattern.compile("^(?:=*|-*)$", Pattern.MULTILINE); @@ -26,6 +22,9 @@ public class NoteUtil { private static final Pattern pSpace1 = Pattern.compile("^\\s+", Pattern.MULTILINE); private static final Pattern pSpace2 = Pattern.compile("\\s+$", Pattern.MULTILINE); + private NoteUtil() { + + } /** * Strips all MarkDown from the given String diff --git a/fastlane/metadata/android/en-US/changelogs/59.txt b/fastlane/metadata/android/en-US/changelogs/59.txt index 5e33be02..273aacf3 100644 --- a/fastlane/metadata/android/en-US/changelogs/59.txt +++ b/fastlane/metadata/android/en-US/changelogs/59.txt @@ -1,3 +1,10 @@ +⚠️ Requires at least Files app¹ version 3.9.0 ⚠️ + - Disable accountchooser after added a new account - Enable ripple effect on selecting a note -- Handle not installed Files app more gracefully
\ No newline at end of file +- Handle not installed Files app more gracefully +- Fix some codacy issues + +Special thanks to @dan0xii @korelstar and @tobiasKaminsky + +¹ https://github.com/nextcloud/android
\ No newline at end of file |