Merge pull request #82 from NordicSemiconductor/bugfix/name

philips77 · web-flow · commit 0286b7c301d2 · 2024-08-30T14:08:44.000+02:00
Bugs fixed
diff --git a/log-timber/src/main/java/no/nordicsemi/android/log/timber/nRFLoggerTree.java b/log-timber/src/main/java/no/nordicsemi/android/log/timber/nRFLoggerTree.java
@@ -50,13 +50,13 @@ public class nRFLoggerTree extends Timber.Tree {
 	// Constructors
 
 	public nRFLoggerTree(final @NonNull Context context,
-						 final @NonNull String key, final @NonNull String name) {
+						 final @NonNull String key, final @Nullable String name) {
 		this.session = Logger.newSession(context, null, key, name);
 	}
 
 	public nRFLoggerTree(final @NonNull Context context,
 						 final @Nullable String profile,
-						 final @NonNull String key, final @NonNull String name) {
+						 final @NonNull String key, final @Nullable String name) {
 		this.session = Logger.newSession(context, profile, key, name);
 	}
 
diff --git a/log/src/main/java/no/nordicsemi/android/log/ILogSession.java b/log/src/main/java/no/nordicsemi/android/log/ILogSession.java
@@ -31,10 +31,10 @@
 
 package no.nordicsemi.android.log;
 
-import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 
 @SuppressWarnings("unused")
@@ -49,9 +49,8 @@ public interface ILogSession {
 	Context getContext();
 
 	/**
-	 * Returns the session {@link Uri}. The Uri may be saved in
-	 * {@link Activity#onSaveInstanceState(android.os.Bundle)} to recreate the session using
-	 * {@link Logger#openSession(Context, Uri)} when orientation change.
+	 * Returns the session {@link Uri}. The Uri may be saved in a saved state
+	 * to recreate the session using {@link Logger#openSession(Context, Uri)} when orientation change.
 	 * Use this Uri also to open the log session in the nRF Logger.
 	 *
 	 * <pre>
diff --git a/log/src/main/java/no/nordicsemi/android/log/LocalLogSession.java b/log/src/main/java/no/nordicsemi/android/log/LocalLogSession.java
@@ -35,6 +35,8 @@
 import android.content.Context;
 import android.net.Uri;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import android.util.Log;
 
 import no.nordicsemi.android.log.localprovider.LocalLogContentProvider;
@@ -67,7 +69,7 @@ public class LocalLogSession implements ILogSession {
 	 */
 	public static LocalLogSession newSession(@NonNull final Context context,
 											 @NonNull final Uri authority,
-											 @NonNull final String key, @NonNull final String name) {
+											 @NonNull final String key, @Nullable final String name) {
 		final Uri uri = authority.buildUpon()
 				.appendEncodedPath(LogContract.Session.SESSION_CONTENT_DIRECTORY)
 				.appendEncodedPath(LogContract.Session.KEY_CONTENT_DIRECTORY)
diff --git a/log/src/main/java/no/nordicsemi/android/log/localprovider/LocalLogContentProvider.java b/log/src/main/java/no/nordicsemi/android/log/localprovider/LocalLogContentProvider.java
@@ -152,7 +152,7 @@ public abstract class LocalLogContentProvider extends ContentProvider {
 	 */
 	private String mSerializeDbTag;
 
-	protected LocalLogDatabaseHelper getDatabaseHelper(final Context context) {
+	/*package*/LocalLogDatabaseHelper getDatabaseHelper(final Context context) {
 		return LocalLogDatabaseHelper.getInstance(context);
 	}
 
@@ -320,7 +320,7 @@ public int bulkInsert(@NonNull final Uri uri, @NonNull final ContentValues[] val
 				if (++opCount >= BULK_INSERTS_PER_YIELD_POINT) {
 					opCount = 0;
 					try {
-						yield(transaction);
+						yieldTransaction(transaction);
 					} catch (RuntimeException re) {
 						transaction.markYieldFailed();
 						throw re;
@@ -358,7 +358,7 @@ public ContentProviderResult[] applyBatch(@NonNull final ArrayList<ContentProvid
 				if (i > 0 && operation.isYieldAllowed()) {
 					opCount = 0;
 					try {
-						if (yield(transaction)) {
+						if (yieldTransaction(transaction)) {
 							ypCount++;
 						}
 					} catch (RuntimeException re) {
@@ -579,14 +579,14 @@ private void endTransaction(final Uri uri, final boolean callerIsBatch) {
 				transaction.finish(callerIsBatch);
 			} finally {
 				// No matter what, make sure we clear out the thread-local transaction reference.
-				mTransactionHolder.set(null);
+                mTransactionHolder.remove();
 			}
 		}
 	}
 
-	protected boolean yield(LogTransaction transaction) {
+	private boolean yieldTransaction(LogTransaction transaction) {
 		// Now proceed with the DB yield.
-		SQLiteDatabase db = transaction.getDbForTag(DB_TAG);
+		final SQLiteDatabase db = transaction.getDbForTag(DB_TAG);
 		return db != null && db.yieldIfContendedSafely(SLEEP_AFTER_YIELD_DELAY);
 	}
 
diff --git a/log/src/main/java/no/nordicsemi/android/log/localprovider/ProjectionMap.java b/log/src/main/java/no/nordicsemi/android/log/localprovider/ProjectionMap.java
@@ -45,7 +45,7 @@
 
 	public static class Builder {
 
-		private ProjectionMap mMap = new ProjectionMap();
+		private final ProjectionMap mMap = new ProjectionMap();
 
 		Builder add(@NonNull String column) {
 			mMap.putColumn(column, column);
diff --git a/sample/src/main/java/no/nordicsemi/android/log/example/MainActivity.java b/sample/src/main/java/no/nordicsemi/android/log/example/MainActivity.java
@@ -64,13 +64,10 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) {
 
 	private boolean logProviderExists() {
 		// The method below requires API 16
-		final ContentProviderClient unstableClient = getContentResolver()
-				.acquireUnstableContentProviderClient(LogContract.AUTHORITY);
-		if (unstableClient == null)
-			return false;
-
-		unstableClient.release();
-		return true;
+		try (final ContentProviderClient client = getContentResolver()
+				.acquireContentProviderClient(LogContract.AUTHORITY)) {
+            return client != null;
+        }
 	}
 
 }
diff --git a/sample/src/main/java/no/nordicsemi/android/log/example/fragment/KeyNameDialogFragment.java b/sample/src/main/java/no/nordicsemi/android/log/example/fragment/KeyNameDialogFragment.java
@@ -37,7 +37,6 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.KeyEvent;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
@@ -66,7 +65,7 @@ public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
 				.setNegativeButton(android.R.string.no, null)
 				.setPositiveButton(android.R.string.ok, this);
 
-		final View view = LayoutInflater.from(requireContext())
+		final View view = getLayoutInflater()
 				.inflate(R.layout.fragment_dialog_key_name, null);
 		mKeyView = view.findViewById(R.id.key);
 		mNameView = view.findViewById(R.id.name);
diff --git a/sample/src/main/java/no/nordicsemi/android/log/example/fragment/MainFragment.java b/sample/src/main/java/no/nordicsemi/android/log/example/fragment/MainFragment.java
@@ -34,7 +34,6 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -156,34 +155,32 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
 		Button openButton = mShowSessionInLoggerButton = rootView.findViewById(R.id.action_open);
 		openButton.setEnabled(sessionOpen);
 		openButton.setOnClickListener(v -> {
-			if (mLogSession != null) {
+            final Intent intent;
+            if (mLogSession != null) {
 				// Open the log session in any app that supports nRF Logger log provider, f.e. in nRF Logger
-				Intent intent = new Intent(Intent.ACTION_VIEW, mLogSession.getSessionUri());
-				intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				startActivity(intent);
-			} else {
+                intent = new Intent(Intent.ACTION_VIEW, mLogSession.getSessionUri());
+            } else {
 				// nRF Logger is not installed, open the Google Play
-				Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=no.nordicsemi.android.log"));
-				intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				startActivity(intent);
-			}
-		});
+                intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=no.nordicsemi.android.log"));
+            }
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
 
 		Button openSessionsButton = mShowAllSessionsInLoggerButton = rootView.findViewById(R.id.action_open_sessions);
 		openSessionsButton.setEnabled(sessionOpen);
 		openSessionsButton.setOnClickListener(v -> {
-			if (mLogSession instanceof LogSession) {
+            final Intent intent;
+            if (mLogSession instanceof LogSession) {
 				// Open the sessions in any app that supports nRF Logger log provider, f.e. in nRF Logger
-				Intent intent = new Intent(Intent.ACTION_VIEW, ((LogSession) mLogSession).getSessionsUri());
-				intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				startActivity(intent);
-			} else {
+                intent = new Intent(Intent.ACTION_VIEW, ((LogSession) mLogSession).getSessionsUri());
+            } else {
 				// nRF Logger is not installed, open the Google Play
-				Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=no.nordicsemi.android.log"));
-				intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-				startActivity(intent);
-			}
-		});
+                intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=no.nordicsemi.android.log"));
+            }
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+        });
 
 		return rootView;
 	}
@@ -258,7 +255,7 @@ public void onLoadFinished(@NonNull final Loader<Cursor> loader, @Nullable final
 
 	@Override
 	public void onLoaderReset(@NonNull final Loader<Cursor> loader) {
-		mLogAdapter.swapCursor(null);
+		mLogAdapter.changeCursor(null);
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,13 @@ public class nRFLoggerTree extends Timber.Tree {`
`50`	`50`	`// Constructors`
`51`	`51`
`52`	`52`	`public nRFLoggerTree(final @NonNull Context context,`
`53`		`- final @NonNull String key, final @NonNull String name) {`
	`53`	`+ final @NonNull String key, final @Nullable String name) {`
`54`	`54`	`this.session = Logger.newSession(context, null, key, name);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public nRFLoggerTree(final @NonNull Context context,`
`58`	`58`	`final @Nullable String profile,`
`59`		`- final @NonNull String key, final @NonNull String name) {`
	`59`	`+ final @NonNull String key, final @Nullable String name) {`
`60`	`60`	`this.session = Logger.newSession(context, profile, key, name);`
`61`	`61`	`}`
`62`	`62`