[Libreoffice-commits] core.git: android/source
Michael Weghorn (via logerrit)
logerrit at kemper.freedesktop.org
Fri Apr 23 21:26:58 UTC 2021
android/source/src/java/org/libreoffice/AboutDialogFragment.java | 2 -
android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java | 1
android/source/src/java/org/libreoffice/FormattingController.java | 2 -
android/source/src/java/org/libreoffice/InvalidationHandler.java | 4 +-
android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java | 2 -
android/source/src/java/org/libreoffice/LOKitShell.java | 2 -
android/source/src/java/org/libreoffice/LOKitThread.java | 5 +-
android/source/src/java/org/libreoffice/LOKitTileProvider.java | 17 ++++------
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 2 -
android/source/src/java/org/libreoffice/SearchController.java | 2 -
android/source/src/java/org/libreoffice/ThumbnailCreator.java | 2 -
android/source/src/java/org/libreoffice/UNOCommandsController.java | 6 +--
android/source/src/java/org/libreoffice/ui/PageView.java | 10 ++---
android/source/src/java/org/libreoffice/ui/RecentFile.java | 4 +-
android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java | 4 +-
15 files changed, 28 insertions(+), 37 deletions(-)
New commits:
commit fbcc644bad1fb0ad9a9387ba93339b24c126629f
Author: Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Fri Apr 23 14:51:18 2021 +0200
Commit: Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Apr 23 23:26:16 2021 +0200
android: Some trivial style improvements
Those were mostly suggested by Android Studio, like:
* mark members static or final
* drop unused variables and members
* avoid unnecessary cast
* simplify condition: '(!cond)' instead of 'cond == false'
* drop unused imports
Change-Id: I252fe836e4a3184e13af59a30202c6daccac1794
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114546
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java b/android/source/src/java/org/libreoffice/AboutDialogFragment.java
index 8e4ddf0ae08c..b8e22077e928 100644
--- a/android/source/src/java/org/libreoffice/AboutDialogFragment.java
+++ b/android/source/src/java/org/libreoffice/AboutDialogFragment.java
@@ -26,8 +26,6 @@ import android.text.method.LinkMovementMethod;
import android.view.View;
import android.widget.TextView;
-import java.io.File;
-
public class AboutDialogFragment extends DialogFragment {
@NonNull @Override
diff --git a/android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java b/android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java
index a576fc67dcb2..a0ed871a40d2 100644
--- a/android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java
+++ b/android/source/src/java/org/libreoffice/DocumentPartViewListAdapter.java
@@ -19,7 +19,6 @@ import android.widget.TextView;
import java.util.List;
public class DocumentPartViewListAdapter extends ArrayAdapter<DocumentPartView> {
- private static final String LOGTAG = DocumentPartViewListAdapter.class.getSimpleName();
private final Activity activity;
private final ThumbnailCreator thumbnailCollector;
diff --git a/android/source/src/java/org/libreoffice/FormattingController.java b/android/source/src/java/org/libreoffice/FormattingController.java
index a34c4c41ee29..a729e357bfe9 100644
--- a/android/source/src/java/org/libreoffice/FormattingController.java
+++ b/android/source/src/java/org/libreoffice/FormattingController.java
@@ -40,7 +40,7 @@ class FormattingController implements View.OnClickListener {
private static final int SELECT_PHOTO = 2;
private static final int IMAGE_BUFFER_SIZE = 4 * 1024;
- private LibreOfficeMainActivity mContext;
+ private final LibreOfficeMainActivity mContext;
private String mCurrentPhotoPath;
FormattingController(LibreOfficeMainActivity context) {
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index b74d92d15460..d74f150bfb44 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -25,12 +25,12 @@ import java.util.List;
* Parses (interprets) and handles invalidation messages from LibreOffice.
*/
public class InvalidationHandler implements Document.MessageCallback, Office.MessageCallback {
- private static String LOGTAG = InvalidationHandler.class.getSimpleName();
+ private static final String LOGTAG = InvalidationHandler.class.getSimpleName();
private final DocumentOverlay mDocumentOverlay;
private final GeckoLayerClient mLayerClient;
private OverlayState mState;
private boolean mKeyEvent = false;
- private LibreOfficeMainActivity mContext;
+ private final LibreOfficeMainActivity mContext;
private int currentTotalPageNumber = 0; // total page number of the current document
diff --git a/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java b/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java
index bbef709af297..7b50ef5ff707 100644
--- a/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java
+++ b/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java
@@ -19,7 +19,7 @@ import org.mozilla.gecko.gfx.InputConnectionHandler;
* directed to this class which is then directed further to LOKitThread.
*/
public class LOKitInputConnectionHandler implements InputConnectionHandler {
- private static String LOGTAG = LOKitInputConnectionHandler.class.getSimpleName();
+ private static final String LOGTAG = LOKitInputConnectionHandler.class.getSimpleName();
@Override
public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
diff --git a/android/source/src/java/org/libreoffice/LOKitShell.java b/android/source/src/java/org/libreoffice/LOKitShell.java
index 5fb7159f1032..f6a76228e008 100644
--- a/android/source/src/java/org/libreoffice/LOKitShell.java
+++ b/android/source/src/java/org/libreoffice/LOKitShell.java
@@ -24,8 +24,6 @@ import org.mozilla.gecko.gfx.ComposedTileLayer;
* Common static LOKit functions, functions to send events.
*/
public class LOKitShell {
- private static final String LOGTAG = LOKitShell.class.getSimpleName();
-
public static float getDpi(Context context) {
LOKitTileProvider tileProvider = ((LibreOfficeMainActivity)context).getTileProvider();
if (tileProvider != null && tileProvider.isSpreadsheet())
diff --git a/android/source/src/java/org/libreoffice/LOKitThread.java b/android/source/src/java/org/libreoffice/LOKitThread.java
index 1bca3cd13b5c..fb076389f0f4 100644
--- a/android/source/src/java/org/libreoffice/LOKitThread.java
+++ b/android/source/src/java/org/libreoffice/LOKitThread.java
@@ -7,7 +7,6 @@ import android.util.Log;
import android.view.KeyEvent;
import org.libreoffice.canvas.SelectionHandle;
-import org.libreoffice.ui.LibreOfficeUIActivity;
import org.mozilla.gecko.ZoomConstraints;
import org.mozilla.gecko.gfx.CairoImage;
import org.mozilla.gecko.gfx.ComposedTileLayer;
@@ -26,13 +25,13 @@ import java.util.concurrent.LinkedBlockingQueue;
class LOKitThread extends Thread {
private static final String LOGTAG = LOKitThread.class.getSimpleName();
- private LinkedBlockingQueue<LOEvent> mEventQueue = new LinkedBlockingQueue<LOEvent>();
+ private final LinkedBlockingQueue<LOEvent> mEventQueue = new LinkedBlockingQueue<LOEvent>();
private TileProvider mTileProvider;
private InvalidationHandler mInvalidationHandler;
private ImmutableViewportMetrics mViewportMetrics;
private GeckoLayerClient mLayerClient;
- private LibreOfficeMainActivity mContext;
+ private final LibreOfficeMainActivity mContext;
LOKitThread(LibreOfficeMainActivity context) {
mContext = context;
diff --git a/android/source/src/java/org/libreoffice/LOKitTileProvider.java b/android/source/src/java/org/libreoffice/LOKitTileProvider.java
index a5222f7e46ea..1c04fbe5a43a 100644
--- a/android/source/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/source/src/java/org/libreoffice/LOKitTileProvider.java
@@ -12,7 +12,6 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.PointF;
import android.os.Build;
-import android.os.Environment;
import android.print.PrintAttributes;
import android.print.PrintDocumentAdapter;
import android.print.PrintManager;
@@ -26,7 +25,6 @@ import org.libreoffice.kit.DirectBufferAllocator;
import org.libreoffice.kit.Document;
import org.libreoffice.kit.LibreOfficeKit;
import org.libreoffice.kit.Office;
-import org.libreoffice.ui.FileUtilities;
import org.mozilla.gecko.gfx.BufferedCairoImage;
import org.mozilla.gecko.gfx.CairoImage;
import org.mozilla.gecko.gfx.IntSize;
@@ -39,22 +37,22 @@ import java.nio.ByteBuffer;
*/
class LOKitTileProvider implements TileProvider {
private static final String LOGTAG = LOKitTileProvider.class.getSimpleName();
- private static int TILE_SIZE = 256;
+ private static final int TILE_SIZE = 256;
private final float mTileWidth;
private final float mTileHeight;
private String mInputFile;
private Office mOffice;
private Document mDocument;
- private boolean mIsReady = false;
- private LibreOfficeMainActivity mContext;
+ private final boolean mIsReady;
+ private final LibreOfficeMainActivity mContext;
- private float mDPI;
+ private final float mDPI;
private float mWidthTwip;
private float mHeightTwip;
- private Document.MessageCallback mMessageCallback;
+ private final Document.MessageCallback mMessageCallback;
- private long objectCreationTime = System.currentTimeMillis();
+ private final long objectCreationTime = System.currentTimeMillis();
/**
* Initialize LOKit and load the document.
@@ -73,7 +71,6 @@ class LOKitTileProvider implements TileProvider {
mOffice.setOptionalFeatures(Document.LOK_FEATURE_DOCUMENT_PASSWORD);
mContext.setTileProvider(this);
mInputFile = input;
- File f = new File(mInputFile);
Log.i(LOGTAG, "====> Loading file '" + input + "'");
@@ -251,7 +248,7 @@ class LOKitTileProvider implements TileProvider {
public void removePart() {
try{
- if(isSpreadsheet() == false && isPresentation() == false) {
+ if (!isSpreadsheet() && !isPresentation()) {
//document must be spreadsheet or presentation
return;
}
diff --git a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 28427b51435b..9d8828811ade 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -79,7 +79,7 @@ public class LibreOfficeMainActivity extends AppCompatActivity implements Settin
Toolbar toolbarTop;
private ListView mDrawerList;
- private List<DocumentPartView> mDocumentPartView = new ArrayList<DocumentPartView>();
+ private final List<DocumentPartView> mDocumentPartView = new ArrayList<DocumentPartView>();
private DocumentPartViewListAdapter mDocumentPartViewListAdapter;
private DocumentOverlay mDocumentOverlay;
/** URI to save the document to. */
diff --git a/android/source/src/java/org/libreoffice/SearchController.java b/android/source/src/java/org/libreoffice/SearchController.java
index a9414f7f7a71..8bdf42e8be8c 100644
--- a/android/source/src/java/org/libreoffice/SearchController.java
+++ b/android/source/src/java/org/libreoffice/SearchController.java
@@ -11,7 +11,7 @@ import org.json.JSONException;
import org.json.JSONObject;
public class SearchController implements View.OnClickListener {
- private LibreOfficeMainActivity mActivity;
+ private final LibreOfficeMainActivity mActivity;
private enum SearchDirection {
UP, DOWN
diff --git a/android/source/src/java/org/libreoffice/ThumbnailCreator.java b/android/source/src/java/org/libreoffice/ThumbnailCreator.java
index 52870b67a5b9..c0c097747c69 100644
--- a/android/source/src/java/org/libreoffice/ThumbnailCreator.java
+++ b/android/source/src/java/org/libreoffice/ThumbnailCreator.java
@@ -71,7 +71,7 @@ public class ThumbnailCreator {
class ThumbnailCreationTask{
private final WeakReference<ImageView> imageViewReference;
- private int partNumber;
+ private final int partNumber;
private boolean cancelled = false;
public ThumbnailCreationTask(ImageView imageView, int partNumber) {
diff --git a/android/source/src/java/org/libreoffice/UNOCommandsController.java b/android/source/src/java/org/libreoffice/UNOCommandsController.java
index 9453b3bd07b7..5834f7e07001 100644
--- a/android/source/src/java/org/libreoffice/UNOCommandsController.java
+++ b/android/source/src/java/org/libreoffice/UNOCommandsController.java
@@ -21,7 +21,7 @@ import org.json.JSONObject;
import static org.libreoffice.SearchController.addProperty;
class UNOCommandsController implements View.OnClickListener {
- private LibreOfficeMainActivity mActivity;
+ private final LibreOfficeMainActivity mActivity;
private JSONObject mRootJSON = new JSONObject();
@@ -72,7 +72,7 @@ class UNOCommandsController implements View.OnClickListener {
})
.setIcon(android.R.drawable.ic_dialog_info)
.show();
- TextView textView = (TextView) dialog.findViewById(android.R.id.message);
+ TextView textView = dialog.findViewById(android.R.id.message);
if (textView != null) {
textView.setScroller(new Scroller(mActivity));
textView.setVerticalScrollBarEnabled(true);
@@ -82,4 +82,4 @@ class UNOCommandsController implements View.OnClickListener {
e.printStackTrace();
}
}
-}
\ No newline at end of file
+}
diff --git a/android/source/src/java/org/libreoffice/ui/PageView.java b/android/source/src/java/org/libreoffice/ui/PageView.java
index 1d32a7de7e80..11b365f2bbcc 100644
--- a/android/source/src/java/org/libreoffice/ui/PageView.java
+++ b/android/source/src/java/org/libreoffice/ui/PageView.java
@@ -17,7 +17,7 @@ import android.view.View;
public class PageView extends View{
private Bitmap bmp;
private Paint mPaintBlack;
- private String tag = "PageView";
+ private static final String LOGTAG = "PageView";
public PageView(Context context ) {
super(context);
@@ -27,7 +27,7 @@ public class PageView extends View{
public PageView(Context context, AttributeSet attrs) {
super(context, attrs);
bmp = BitmapFactory.decodeResource(getResources(), R.drawable.dummy_page);
- Log.d( tag , bmp.toString());
+ Log.d(LOGTAG, bmp.toString());
intialise();
}
public PageView(Context context, AttributeSet attrs, int defStyle) {
@@ -39,7 +39,7 @@ public class PageView extends View{
private void intialise(){
mPaintBlack = new Paint();
mPaintBlack.setARGB(255, 0, 0, 0);
- Log.d(tag, " Doing some set-up");
+ Log.d(LOGTAG, " Doing some set-up");
}
public void setBitmap(Bitmap bmp){
@@ -49,8 +49,8 @@ public class PageView extends View{
@Override
protected void onDraw(Canvas canvas) {
super.onDraw(canvas);
- Log.d(tag, "Draw");
- Log.d(tag, Integer.toString(bmp.getHeight()));
+ Log.d(LOGTAG, "Draw");
+ Log.d(LOGTAG, Integer.toString(bmp.getHeight()));
if( bmp != null ){
int horizontalMargin = (int) (canvas.getWidth()*0.1);
//int verticalMargin = (int) (canvas.getHeight()*0.1);
diff --git a/android/source/src/java/org/libreoffice/ui/RecentFile.java b/android/source/src/java/org/libreoffice/ui/RecentFile.java
index 77cf3c1b116d..fdcc688aa140 100644
--- a/android/source/src/java/org/libreoffice/ui/RecentFile.java
+++ b/android/source/src/java/org/libreoffice/ui/RecentFile.java
@@ -7,8 +7,8 @@ import android.net.Uri;
*/
public class RecentFile {
- private Uri uri;
- private String displayName;
+ private final Uri uri;
+ private final String displayName;
public RecentFile(Uri docUri, String name) {
uri = docUri;
diff --git a/android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java b/android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java
index c25fa8270f69..6011035c1610 100644
--- a/android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java
+++ b/android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java
@@ -23,8 +23,8 @@ import java.util.List;
class RecentFilesAdapter extends RecyclerView.Adapter<RecentFilesAdapter.ViewHolder> {
- private LibreOfficeUIActivity mActivity;
- private List<RecentFile> recentFiles;
+ private final LibreOfficeUIActivity mActivity;
+ private final List<RecentFile> recentFiles;
RecentFilesAdapter(LibreOfficeUIActivity activity, List<RecentFile> recentFiles) {
this.mActivity = activity;
More information about the Libreoffice-commits
mailing list