beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 09:00:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

More fixes

Browse source
This commit is contained in:
crschnick 2024-02-20 03:02:26 +00:00
parent e428ea052f
commit f5846611d1
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/io/xpipe/app/comp/base/DialogComp.java
View file

@ -84,7 +84,7 @@ public abstract class DialogComp extends Comp<CompStructure<Region>> {
public abstract Comp<?> content(); public abstract Comp<?> content();
protected Comp<?> scrollPane(Comp<?> content) { protected Comp<?> scrollPane(Comp<?> content) {
var entry = content().styleClass("dialog-content"); var entry = content.styleClass("dialog-content");
return Comp.of(() -> { return Comp.of(() -> {
var entryR = entry.createRegion(); var entryR = entry.createRegion();
var sp = new ScrollPane(entryR); var sp = new ScrollPane(entryR);

2
app/src/main/java/io/xpipe/app/core/App.java
View file

@ -120,8 +120,6 @@ public class App extends Application {
public void focus() { public void focus() {
PlatformThread.runLaterIfNeeded(() -> { PlatformThread.runLaterIfNeeded(() -> {
stage.setAlwaysOnTop(true);
stage.setAlwaysOnTop(false);
stage.requestFocus(); stage.requestFocus();
}); });
} }

5
app/src/main/java/io/xpipe/app/core/mode/BaseMode.java
View file

@ -40,8 +40,6 @@ public class BaseMode extends OperationMode {
TrackEvent.info("Initializing base mode components ..."); TrackEvent.info("Initializing base mode components ...");
AppExtensionManager.init(true); AppExtensionManager.init(true);
JacksonMapper.initModularized(AppExtensionManager.getInstance().getExtendedLayer()); JacksonMapper.initModularized(AppExtensionManager.getInstance().getExtendedLayer());
// Load translations before storage initialization to localize store error messages
// Also loaded before antivirus alert to localize that
AppI18n.init(); AppI18n.init();
LicenseProvider.get().init(); LicenseProvider.get().init();
AppPrefs.init(); AppPrefs.init();
@ -61,9 +59,6 @@ public class BaseMode extends OperationMode {
ActionProvider.initProviders(); ActionProvider.initProviders();
TrackEvent.info("Finished base components initialization"); TrackEvent.info("Finished base components initialization");
initialized = true; initialized = true;
var sec = new VaultKeySecretValue(new char[] {1, 2, 3});
sec.getSecret();
} }
@Override @Override

11
app/src/main/java/io/xpipe/app/storage/DataStorage.java
View file

@ -220,12 +220,12 @@ public abstract class DataStorage {
public abstract boolean supportsSharing(); public abstract boolean supportsSharing();
public boolean shouldShare(DataStoreCategory entry) { public boolean shouldShare(DataStoreCategory category) {
if (!entry.canShare()) { if (!category.canShare()) {
return false; return false;
} }
DataStoreCategory c = entry; DataStoreCategory c = category;
do { do {
if (!c.shouldShareChildren()) { if (!c.shouldShareChildren()) {
return false; return false;
@ -246,6 +246,11 @@ public abstract class DataStorage {
DataStoreEntry c = entry; DataStoreEntry c = entry;
do { do {
// We can't check for sharing of invalid entries
if (!c.getValidity().isUsable()) {
return false;
}
if (c.getStore() instanceof LocalStore && entry.getProvider().isShareableFromLocalMachine()) { if (c.getStore() instanceof LocalStore && entry.getProvider().isShareableFromLocalMachine()) {
return true; return true;
} }