Merge pull request #6716 from TeamNewPipe/release_0.21.7

Hotfix release 0.21.7

app/build.gradle

@@ -17,8 +17,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 972
+        versionCode 973
-        versionName "0.21.6"
+        versionName "0.21.7"
 
         multiDexEnabled true
 
@@ -201,7 +201,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.fragment:fragment-ktx:1.3.4'
+    implementation 'androidx.fragment:fragment-ktx:1.3.5'
     implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -589,9 +589,9 @@ public class RouterActivity extends AppCompatActivity {
                     downloadDialog.setVideoStreams(sortedVideoStreams);
                     downloadDialog.setAudioStreams(result.getAudioStreams());
                     downloadDialog.setSelectedVideoStream(selectedVideoStreamIndex);
+                    downloadDialog.setOnDismissListener(dialog -> finish());
                     downloadDialog.show(fm, "downloadDialog");
                     fm.executePendingTransactions();
-                    downloadDialog.requireDialog().setOnDismissListener(dialog -> finish());
                 }, throwable ->
                         showUnsupportedUrlDialog(currentUrl)));
     }

app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java

@@ -1,7 +1,6 @@
 package org.schabi.newpipe.local;
 
 import android.content.SharedPreferences;
-import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.util.Log;
@@ -26,6 +25,7 @@ import org.schabi.newpipe.fragments.list.ListViewContract;
 
 import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.ktx.ViewUtils.animateHideRecyclerViewAllowingScrolling;
+import static org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout;
 
 /**
  * This fragment is design to be used with persistent data such as
@@ -77,7 +77,7 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
         super.onResume();
         if (updateFlags != 0) {
             if ((updateFlags & LIST_MODE_UPDATE_FLAG) != 0) {
-                final boolean useGrid = isGridLayout();
+                final boolean useGrid = shouldUseGridLayout(requireContext());
                 itemsList.setLayoutManager(
                         useGrid ? getGridLayoutManager() : getListLayoutManager());
                 itemListAdapter.setUseGridVariant(useGrid);
@@ -121,7 +121,7 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
 
         itemListAdapter = new LocalItemListAdapter(activity);
 
-        final boolean useGrid = isGridLayout();
+        final boolean useGrid = shouldUseGridLayout(requireContext());
         itemsList = rootView.findViewById(R.id.items_list);
         itemsList.setLayoutManager(useGrid ? getGridLayoutManager() : getListLayoutManager());
 
@@ -260,17 +260,4 @@ public abstract class BaseLocalListFragment<I, N> extends BaseStateFragment<I>
             updateFlags |= LIST_MODE_UPDATE_FLAG;
         }
     }
-
-    protected boolean isGridLayout() {
-        final String listMode = PreferenceManager.getDefaultSharedPreferences(activity)
-                .getString(getString(R.string.list_view_mode_key),
-                        getString(R.string.list_view_mode_value));
-        if ("auto".equals(listMode)) {
-            final Configuration configuration = getResources().getConfiguration();
-            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
-                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
-        } else {
-            return "grid".equals(listMode);
-        }
-    }
 }

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt

@@ -23,7 +23,6 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.content.SharedPreferences
-import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
@@ -74,10 +73,10 @@ import org.schabi.newpipe.player.helper.PlayerHolder
 import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.StreamDialogEntry
+import org.schabi.newpipe.util.ThemeHelper.getGridSpanCount
+import org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout
 import java.time.OffsetDateTime
 import java.util.ArrayList
-import kotlin.math.floor
-import kotlin.math.max
 
 class FeedFragment : BaseStateFragment<FeedState>() {
     private var _feedBinding: FragmentFeedBinding? = null
@@ -161,7 +160,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
 
     fun setupListViewMode() {
         // does everything needed to setup the layouts for grid or list modes
-        groupAdapter.spanCount = if (shouldUseGridLayout()) getGridSpanCount() else 1
+        groupAdapter.spanCount = if (shouldUseGridLayout(context)) getGridSpanCount(context) else 1
         feedBinding.itemsList.layoutManager = GridLayoutManager(requireContext(), groupAdapter.spanCount).apply {
             spanSizeLookup = groupAdapter.spanSizeLookup
         }
@@ -384,7 +383,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
     @SuppressLint("StringFormatMatches")
     private fun handleLoadedState(loadedState: FeedState.LoadedState) {
 
-        val itemVersion = if (shouldUseGridLayout()) {
+        val itemVersion = if (shouldUseGridLayout(context)) {
             StreamItem.ItemVersion.GRID
         } else {
             StreamItem.ItemVersion.NORMAL
@@ -528,35 +527,6 @@ class FeedFragment : BaseStateFragment<FeedState>() {
         listState = null
     }
 
-    // /////////////////////////////////////////////////////////////////////////
-    // Grid Mode
-    // /////////////////////////////////////////////////////////////////////////
-
-    // TODO: Move these out of this class, as it can be reused
-
-    private fun shouldUseGridLayout(): Boolean {
-        val listMode = PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value))
-
-        return when (listMode) {
-            getString(R.string.list_view_mode_auto_key) -> {
-                val configuration = resources.configuration
-
-                (
-                    configuration.orientation == Configuration.ORIENTATION_LANDSCAPE &&
-                        configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
-                    )
-            }
-            getString(R.string.list_view_mode_grid_key) -> true
-            else -> false
-        }
-    }
-
-    private fun getGridSpanCount(): Int {
-        val minWidth = resources.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width)
-        return max(1, floor(resources.displayMetrics.widthPixels / minWidth.toDouble()).toInt())
-    }
-
     companion object {
         const val KEY_GROUP_ID = "ARG_GROUP_ID"
         const val KEY_GROUP_NAME = "ARG_GROUP_NAME"

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -68,6 +68,7 @@ import io.reactivex.rxjava3.subjects.PublishSubject;
 
 import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
 import static org.schabi.newpipe.ktx.ViewUtils.animate;
+import static org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout;
 
 public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistStreamEntry>, Void> {
     // Save the list 10 seconds after the last change occurred
@@ -678,7 +679,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
 
     private ItemTouchHelper.SimpleCallback getItemTouchCallback() {
         int directions = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
-        if (isGridLayout()) {
+        if (shouldUseGridLayout(requireContext())) {
             directions |= ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT;
         }
         return new ItemTouchHelper.SimpleCallback(directions,

app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.kt

@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.res.Configuration
 import android.os.Bundle
 import android.os.Parcelable
 import android.view.LayoutInflater
@@ -20,7 +19,6 @@ import androidx.activity.result.contract.ActivityResultContracts.StartActivityFo
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.ViewModelProvider
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import com.xwray.groupie.Group
 import com.xwray.groupie.GroupAdapter
@@ -60,12 +58,12 @@ import org.schabi.newpipe.local.subscription.services.SubscriptionsImportService
 import org.schabi.newpipe.streams.io.StoredFileHelper
 import org.schabi.newpipe.util.NavigationHelper
 import org.schabi.newpipe.util.OnClickGesture
+import org.schabi.newpipe.util.ThemeHelper.getGridSpanCount
+import org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout
 import org.schabi.newpipe.util.external_communication.ShareUtils
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
-import kotlin.math.floor
-import kotlin.math.max
 
 class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     private var _binding: FragmentSubscriptionBinding? = null
@@ -279,8 +277,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         super.initViews(rootView, savedInstanceState)
         _binding = FragmentSubscriptionBinding.bind(rootView)
 
-        val shouldUseGridLayout = shouldUseGridLayout()
+        groupAdapter.spanCount = if (shouldUseGridLayout(context)) getGridSpanCount(context) else 1
-        groupAdapter.spanCount = if (shouldUseGridLayout) getGridSpanCount() else 1
         binding.itemsList.layoutManager = GridLayoutManager(requireContext(), groupAdapter.spanCount).apply {
             spanSizeLookup = groupAdapter.spanSizeLookup
         }
@@ -359,7 +356,7 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
     override fun handleResult(result: SubscriptionState) {
         super.handleResult(result)
 
-        val shouldUseGridLayout = shouldUseGridLayout()
+        val shouldUseGridLayout = shouldUseGridLayout(context)
         when (result) {
             is SubscriptionState.LoadedState -> {
                 result.subscriptions.forEach {
@@ -420,30 +417,4 @@ class SubscriptionFragment : BaseStateFragment<SubscriptionState>() {
         super.hideLoading()
         binding.itemsList.animate(true, 200)
     }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // Grid Mode
-    // /////////////////////////////////////////////////////////////////////////
-
-    // TODO: Move these out of this class, as it can be reused
-
-    private fun shouldUseGridLayout(): Boolean {
-        val listMode = PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .getString(getString(R.string.list_view_mode_key), getString(R.string.list_view_mode_value))
-
-        return when (listMode) {
-            getString(R.string.list_view_mode_auto_key) -> {
-                val configuration = resources.configuration
-                configuration.orientation == Configuration.ORIENTATION_LANDSCAPE &&
-                    configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE)
-            }
-            getString(R.string.list_view_mode_grid_key) -> true
-            else -> false
-        }
-    }
-
-    private fun getGridSpanCount(): Int {
-        val minWidth = resources.getDimensionPixelSize(R.dimen.channel_item_grid_min_width)
-        return max(1, floor(resources.displayMetrics.widthPixels / minWidth.toDouble()).toInt())
-    }
 }

app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java

@@ -9,6 +9,9 @@ import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
@@ -18,6 +21,7 @@ import androidx.preference.SwitchPreferenceCompat;
 import com.nononsenseapps.filepicker.Utils;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
 import org.schabi.newpipe.util.FilePickerActivityHelper;
 
 import java.io.File;
@@ -27,14 +31,10 @@ import java.net.URI;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 
-import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
-
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 public class DownloadSettingsFragment extends BasePreferenceFragment {
     public static final boolean IGNORE_RELEASE_ON_OLD_PATH = true;
-    private static final int REQUEST_DOWNLOAD_VIDEO_PATH = 0x1235;
-    private static final int REQUEST_DOWNLOAD_AUDIO_PATH = 0x1236;
     private String downloadPathVideoPreference;
     private String downloadPathAudioPreference;
     private String storageUseSafPreference;
@@ -44,6 +44,12 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
     private Preference prefStorageAsk;
 
     private Context ctx;
+    private final ActivityResultLauncher<Intent> requestDownloadVideoPathLauncher =
+            registerForActivityResult(
+                    new StartActivityForResult(), this::requestDownloadVideoPathResult);
+    private final ActivityResultLauncher<Intent> requestDownloadAudioPathLauncher =
+            registerForActivityResult(
+                    new StartActivityForResult(), this::requestDownloadAudioPathResult);
 
     @Override
     public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
@@ -185,7 +191,6 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
         }
 
         final String key = preference.getKey();
-        final int request;
 
         if (key.equals(storageUseSafPreference)) {
             if (!NewPipeSettings.useStorageAccessFramework(ctx)) {
@@ -198,43 +203,39 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
             updatePreferencesSummary();
             return true;
         } else if (key.equals(downloadPathVideoPreference)) {
-            request = REQUEST_DOWNLOAD_VIDEO_PATH;
+            launchDirectoryPicker(requestDownloadVideoPathLauncher);
         } else if (key.equals(downloadPathAudioPreference)) {
-            request = REQUEST_DOWNLOAD_AUDIO_PATH;
+            launchDirectoryPicker(requestDownloadAudioPathLauncher);
         } else {
             return super.onPreferenceTreeClick(preference);
         }
 
-        startActivityForResult(StoredDirectoryHelper.getPicker(ctx), request);
-
         return true;
     }
 
-    @Override
+    private void launchDirectoryPicker(final ActivityResultLauncher<Intent> launcher) {
-    public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
+        launcher.launch(StoredDirectoryHelper.getPicker(ctx));
+    }
+
+    private void requestDownloadVideoPathResult(final ActivityResult result) {
+        requestDownloadPathResult(result, downloadPathVideoPreference);
+    }
+
+    private void requestDownloadAudioPathResult(final ActivityResult result) {
+        requestDownloadPathResult(result, downloadPathAudioPreference);
+    }
+
+    private void requestDownloadPathResult(final ActivityResult result, final String key) {
         assureCorrectAppLanguage(getContext());
-        super.onActivityResult(requestCode, resultCode, data);
-        if (DEBUG) {
-            Log.d(TAG, "onActivityResult() called with: "
-                    + "requestCode = [" + requestCode + "], "
-                    + "resultCode = [" + resultCode + "], data = [" + data + "]"
-            );
-        }
 
-        if (resultCode != Activity.RESULT_OK) {
+        if (result.getResultCode() != Activity.RESULT_OK) {
             return;
         }
 
-        final String key;
+        Uri uri = null;
-        if (requestCode == REQUEST_DOWNLOAD_VIDEO_PATH) {
+        if (result.getData() != null) {
-            key = downloadPathVideoPreference;
+            uri = result.getData().getData();
-        } else if (requestCode == REQUEST_DOWNLOAD_AUDIO_PATH) {
-            key = downloadPathAudioPreference;
-        } else {
-            return;
         }
-
-        Uri uri = data.getData();
         if (uri == null) {
             showMessageDialog(R.string.general_error, R.string.invalid_directory);
             return;

app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java

@@ -298,4 +298,43 @@ public final class ThemeHelper {
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
         }
     }
+
+
+    /**
+     * Returns whether the grid layout or the list layout should be used. If the user set "auto"
+     * mode in settings, decides based on screen orientation (landscape) and size.
+     *
+     * @param context the context to use
+     * @return true:use grid layout, false:use list layout
+     */
+    public static boolean shouldUseGridLayout(final Context context) {
+        final String listMode = PreferenceManager.getDefaultSharedPreferences(context)
+                .getString(context.getString(R.string.list_view_mode_key),
+                        context.getString(R.string.list_view_mode_value));
+
+        if (listMode.equals(context.getString(R.string.list_view_mode_list_key))) {
+            return false;
+        } else if (listMode.equals(context.getString(R.string.list_view_mode_grid_key))) {
+            return true;
+        } else {
+            final Configuration configuration = context.getResources().getConfiguration();
+            return configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+                    && configuration.isLayoutSizeAtLeast(Configuration.SCREENLAYOUT_SIZE_LARGE);
+        }
+    }
+
+    /**
+     * Calculates the number of grid items that can fit horizontally on the screen. The width of a
+     * grid item is obtained from the thumbnail width plus the right and left paddings.
+     *
+     * @param context the context to use
+     * @return the span count of grid list items
+     */
+    public static int getGridSpanCount(final Context context) {
+        final Resources res = context.getResources();
+        final int minWidth
+                = res.getDimensionPixelSize(R.dimen.video_item_grid_thumbnail_image_width)
+                + res.getDimensionPixelSize(R.dimen.video_item_search_padding) * 2;
+        return Math.max(1, res.getDisplayMetrics().widthPixels / minWidth);
+    }
 }

app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java

@@ -17,6 +17,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
@@ -44,7 +47,6 @@ import us.shandian.giga.ui.adapter.MissionAdapter;
 public class MissionsFragment extends Fragment {
 
     private static final int SPAN_SIZE = 2;
-    private static final int REQUEST_DOWNLOAD_SAVE_AS = 0x1230;
 
     private SharedPreferences mPrefs;
     private boolean mLinear;
@@ -64,7 +66,8 @@ public class MissionsFragment extends Fragment {
     private boolean mForceUpdate;
 
     private DownloadMission unsafeMissionTarget = null;
-
+    private final ActivityResultLauncher<Intent> requestDownloadSaveAsLauncher =
+            registerForActivityResult(new StartActivityForResult(), this::requestDownloadSaveAsResult);
     private final ServiceConnection mConnection = new ServiceConnection() {
 
         @Override
@@ -254,8 +257,9 @@ public class MissionsFragment extends Fragment {
             initialPath = Uri.parse(initialSavePath.getAbsolutePath());
         }
 
-        startActivityForResult(StoredFileHelper.getNewPicker(mContext, mission.storage.getName(),
+        requestDownloadSaveAsLauncher.launch(
-                mission.storage.getType(), initialPath), REQUEST_DOWNLOAD_SAVE_AS);
+                StoredFileHelper.getNewPicker(mContext, mission.storage.getName(),
+                        mission.storage.getType(), initialPath));
     }
 
     @Override
@@ -289,18 +293,17 @@ public class MissionsFragment extends Fragment {
         if (mBinder != null) mBinder.enableNotifications(true);
     }
 
-    @Override
+    private void requestDownloadSaveAsResult(final ActivityResult result) {
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (result.getResultCode() != Activity.RESULT_OK) {
-        super.onActivityResult(requestCode, resultCode, data);
+            return;
+        }
 
-        if (requestCode != REQUEST_DOWNLOAD_SAVE_AS || resultCode != Activity.RESULT_OK) return;
+        if (unsafeMissionTarget == null || result.getData() == null) {
-
-        if (unsafeMissionTarget == null || data.getData() == null) {
             return;
         }
 
         try {
-            Uri fileUri = data.getData();
+            Uri fileUri = result.getData().getData();
             if (fileUri.getAuthority() != null && FilePickerActivityHelper.isOwnFileUri(mContext, fileUri)) {
                 fileUri = Uri.fromFile(Utils.getFileForUri(fileUri));
             }

fastlane/metadata/android/en-US/changelogs/973.txt

@@ -0,0 +1,4 @@
+Hotfix
+• Fix thumbnails and titles being trimmed in grid layout, due to a wrong calculation of how many videos can fit in one row
+• Fix download dialog disappearing without doing anything if opened from the share menu
+• Update a library related to opening external activities such as the Storage Access Framework file picker