fix shortcut widget for newer android versions

Author: CampelloManuel

app/src/main/java/com/nononsenseapps/notepad/widget/shortcut/ShortcutConfig.java

@@ -1,11 +1,15 @@
 package com.nononsenseapps.notepad.widget.shortcut;
 
 import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.AdaptiveIconDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+import android.os.Build;
 import android.os.Bundle;
 import android.widget.SimpleCursorAdapter;
 import android.widget.Spinner;
@@ -19,6 +23,7 @@
 import androidx.loader.content.Loader;
 
 import com.nononsenseapps.helpers.ActivityHelper;
+import com.nononsenseapps.helpers.NnnLogger;
 import com.nononsenseapps.helpers.ThemeHelper;
 import com.nononsenseapps.notepad.R;
 import com.nononsenseapps.notepad.activities.main.ActivityMain_;
@@ -70,6 +75,57 @@ private static Bitmap getBitmapFromDrawable(@NonNull Drawable drawable) {
 	}
 
 	void onOK() {
+		// newer android versions have stricter limits on nested Intents
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+
+			ShortcutManager shortcutManager = this.getSystemService(ShortcutManager.class);
+
+			String shortcutTitle = "";
+			final Intent intent = new Intent();
+			if (mBinding.createNoteSwitch.isChecked()) {
+
+				String listName = null;
+				final Cursor c = (Cursor) mBinding.listSpinner.getSelectedItem();
+				if (c != null && !c.isClosed() && !c.isAfterLast()) {
+					listName = c.getString(1);
+				}
+				if (listName == null) {
+					NnnLogger.error(ShortcutConfig.class, "Unexpected null in listName in ShortcutConfig.java");
+				}
+
+				shortcutTitle = listName + " - " + ShortcutConfig.this.getString(R.string.title_create);
+
+				intent.setClass(ShortcutConfig.this, ActivityMain_.class)
+						.setData(Task.URI)
+						.setAction(Intent.ACTION_INSERT)
+						.putExtra(Task.Columns.DBLIST, mBinding.listSpinner.getSelectedItemId());
+			} else {
+				// this shortcut widget shows a list of notes
+				final Cursor c = (Cursor) mBinding.listSpinner.getSelectedItem();
+
+				if (c != null && !c.isClosed() && !c.isAfterLast()) {
+					shortcutTitle = c.getString(1);
+				}
+				intent.setClass(ShortcutConfig.this, ActivityMain_.class)
+						.setAction(Intent.ACTION_VIEW)
+						.setData(TaskList.getUri(mBinding.listSpinner.getSelectedItemId()));
+			}
+
+			// widget IDs must be unique. We use unique titles for all widget combinations
+			String shortcutId = shortcutTitle;
+			ShortcutInfo shortcut = new ShortcutInfo.Builder(this, shortcutId)
+					.setShortLabel(shortcutTitle)
+					.setLongLabel(shortcutTitle)
+					.setIcon(Icon.createWithResource(this, R.drawable.app_icon))
+					.setIntent(intent)
+					.build();
+
+			shortcutManager.requestPinShortcut(shortcut, null);
+			setResult(RESULT_OK);
+			return;
+		}
+
+		// legacy code that still works for API 23 and 24
 		final Intent shortcutIntent = new Intent();
 		// Set the icon for the shortcut widget
 		Drawable iconDrawable = AppCompatResources.getDrawable(this, R.drawable.app_icon);
@@ -80,8 +136,7 @@ void onOK() {
 		String shortcutTitle = "";
 		final Intent intent = new Intent();
 		if (mBinding.createNoteSwitch.isChecked()) {
-			shortcutTitle = ShortcutConfig.this
-					.getString(R.string.title_create);
+			shortcutTitle = ShortcutConfig.this.getString(R.string.title_create);
 
 			intent.setClass(ShortcutConfig.this, ActivityMain_.class)
 					.setData(Task.URI)
@@ -118,26 +173,30 @@ private void setListEntries(final Spinner listSpinner) {
 
 		listSpinner.setAdapter(mSpinnerAdapter);
 
-		LoaderManager.getInstance(this).restartLoader(0, null, new LoaderManager.LoaderCallbacks<Cursor>() {
-
-			@Override
-			public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-				return new CursorLoader(ShortcutConfig.this,
-						TaskList.URI, new String[] {
-						TaskList.Columns._ID,
-						TaskList.Columns.TITLE }, null, null,
-						TaskList.Columns.TITLE);
-			}
-
-			@Override
-			public void onLoadFinished(Loader<Cursor> arg0, Cursor c) {
-				mSpinnerAdapter.swapCursor(c);
-			}
-
-			@Override
-			public void onLoaderReset(Loader<Cursor> arg0) {
-				mSpinnerAdapter.swapCursor(null);
-			}
-		});
+		LoaderManager
+				.getInstance(this)
+				.restartLoader(0, null, new LoaderManager.LoaderCallbacks<Cursor>() {
+
+					@NonNull
+					@Override
+					public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+						return new CursorLoader(ShortcutConfig.this,
+								TaskList.URI,
+								new String[] { TaskList.Columns._ID, TaskList.Columns.TITLE },
+								null,
+								null,
+								TaskList.Columns.TITLE);
+					}
+
+					@Override
+					public void onLoadFinished(@NonNull Loader<Cursor> arg0, Cursor c) {
+						mSpinnerAdapter.swapCursor(c);
+					}
+
+					@Override
+					public void onLoaderReset(@NonNull Loader<Cursor> arg0) {
+						mSpinnerAdapter.swapCursor(null);
+					}
+				});
 	}
 }