diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java b/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java index 13d6493a27..0212f81b82 100644 --- a/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java @@ -22,7 +22,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.FragmentManager; -import android.support.v7.app.ActionBar; import android.support.v7.app.AlertDialog; import android.support.v7.widget.Toolbar; import android.text.Html; diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java index 0236c7f647..dee77e5781 100644 --- a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java +++ b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java @@ -169,7 +169,8 @@ private static File getIntentDir(final Intent intent, final File fallback) { if (dir.exists() && dir.isDirectory()) { return dir; } - } catch (NullPointerException ignored) {}; + } catch (NullPointerException ignored) { + } return fallback; } diff --git a/app/src/main/java/net/gsantner/markor/model/Document.java b/app/src/main/java/net/gsantner/markor/model/Document.java index c3ac456b0f..ed1bbd9984 100644 --- a/app/src/main/java/net/gsantner/markor/model/Document.java +++ b/app/src/main/java/net/gsantner/markor/model/Document.java @@ -91,10 +91,11 @@ public Document(@NonNull final File file) { } public String getPath() { - return _path; + return _path; } - public @NonNull File getFile() { + public @NonNull + File getFile() { return _file; } diff --git a/app/thirdparty/java/other/writeily/model/WrMarkorSingleton.java b/app/thirdparty/java/other/writeily/model/WrMarkorSingleton.java index 2798b23626..ed3b20310a 100644 --- a/app/thirdparty/java/other/writeily/model/WrMarkorSingleton.java +++ b/app/thirdparty/java/other/writeily/model/WrMarkorSingleton.java @@ -53,7 +53,7 @@ public void setNotesLastDirectory(File notesLastDirectory) { private boolean notChild(final File a, final File b) { try { return b.equals(a) || !b.getParentFile().getCanonicalPath().startsWith(a.getCanonicalPath()); - } catch(IOException e) { + } catch (IOException e) { return false; // Not sure, return false for safety } } @@ -134,7 +134,7 @@ public void moveOrCopySelected(final List files, final File destDir, final if (destDir.isDirectory()) { boolean allSane = true; for (final File file : files) { - final File dest = new File(destDir, file.getName()); + final File dest = new File(destDir, file.getName()); allSane &= isMove ? saneMove(file, dest) : saneCopy(file, dest); } if (allSane) { diff --git a/app/thirdparty/java/other/writeily/widget/WrFilesWidgetFactory.java b/app/thirdparty/java/other/writeily/widget/WrFilesWidgetFactory.java index 6aa1a78064..9da7067849 100644 --- a/app/thirdparty/java/other/writeily/widget/WrFilesWidgetFactory.java +++ b/app/thirdparty/java/other/writeily/widget/WrFilesWidgetFactory.java @@ -17,7 +17,6 @@ import net.gsantner.markor.R; import net.gsantner.markor.format.TextFormat; -import net.gsantner.markor.format.markdown.MarkdownTextConverter; import net.gsantner.markor.model.Document; import net.gsantner.markor.ui.FilesystemViewerCreator; import net.gsantner.markor.util.AppSettings; diff --git a/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java b/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java index 9a472aef23..7060d780f5 100644 --- a/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java +++ b/app/thirdparty/java/other/writeily/widget/WrMarkorWidgetProvider.java @@ -20,8 +20,8 @@ import android.widget.RemoteViews; import net.gsantner.markor.R; -import net.gsantner.markor.activity.openeditor.OpenEditorFromShortcutOrWidgetActivity; import net.gsantner.markor.activity.MainActivity; +import net.gsantner.markor.activity.openeditor.OpenEditorFromShortcutOrWidgetActivity; import net.gsantner.markor.model.Document; import net.gsantner.markor.util.AppSettings; @@ -106,9 +106,9 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] a // ListView final Intent notesListIntent = new Intent(context, WrFilesWidgetService.class) - .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) - .putExtra(Document.EXTRA_PATH, directoryF) - .putExtra(Document.EXTRA_PATH_IS_FOLDER, true); + .putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) + .putExtra(Document.EXTRA_PATH, directoryF) + .putExtra(Document.EXTRA_PATH_IS_FOLDER, true); notesListIntent.setData(Uri.parse(notesListIntent.toUri(Intent.URI_INTENT_SCHEME))); views.setEmptyView(R.id.widget_list_container, R.id.widget_empty_hint);