From 1d3d04ffdf22dd3163bad18b5484fae16b6a06e5 Mon Sep 17 00:00:00 2001 From: James Magahern Date: Fri, 14 Aug 2020 16:44:39 -0700 Subject: [PATCH] Script sorting --- App/Script Policy UI/ScriptPolicyViewController.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/App/Script Policy UI/ScriptPolicyViewController.swift b/App/Script Policy UI/ScriptPolicyViewController.swift index c71a152..83286e1 100644 --- a/App/Script Policy UI/ScriptPolicyViewController.swift +++ b/App/Script Policy UI/ScriptPolicyViewController.swift @@ -98,9 +98,13 @@ class ScriptPolicyViewController: UIViewController, UICollectionViewDelegate let listLayout = UICollectionViewCompositionalLayout.list(using: listConfig) let collectionView = UICollectionView(frame: .zero, collectionViewLayout: listLayout) + // Allowed scripts go to the top + let allowedScripts = loadedScripts.filter { policyManager.allowedOriginsForScriptResources().contains($0) } + // Make sure host origin goes first in the list. - let otherOriginScripts = loadedScripts.subtracting([ hostOrigin ]) - let originItems = [ hostOrigin ] + otherOriginScripts + let otherOriginScripts = loadedScripts.subtracting([ hostOrigin ]).subtracting(allowedScripts) + + let originItems = [ hostOrigin ] + allowedScripts + otherOriginScripts let switchCellRegistry = UICollectionView.CellRegistration { [unowned self] (listCell, indexPath, item) in var config = listCell.defaultContentConfiguration()