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

Fix unnecessary elevation confirmation

Browse source
This commit is contained in:
crschnick 2024-03-25 10:51:33 +00:00
parent db94d2d74b
commit 6e5f131658
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/io/xpipe/app/util/SecretQuery.java
View file

@ -42,7 +42,8 @@ public interface SecretQuery {
return r;
}
var ask = AppPrefs.get().alwaysConfirmElevation().getValue();
// Don't confirm if we already had user interaction
var ask = AppPrefs.get().alwaysConfirmElevation().getValue() && !original.requiresUserInteraction();
if (!ask) {
return r;
}
@ -60,6 +61,11 @@ public interface SecretQuery {
public boolean retryOnFail() {
return true;
}
@Override
public boolean requiresUserInteraction() {
return original.requiresUserInteraction() || AppPrefs.get().alwaysConfirmElevation().getValue();
}
};
}
@ -79,6 +85,11 @@ public interface SecretQuery {
public boolean retryOnFail() {
return true;
}
@Override
public boolean requiresUserInteraction() {
return true;
}
};
}
@ -93,6 +104,8 @@ public interface SecretQuery {
boolean retryOnFail();
boolean requiresUserInteraction();
default boolean respectDontCacheSetting() {
return true;
}

20
app/src/main/java/io/xpipe/app/util/SecretRetrievalStrategy.java
View file

@ -71,6 +71,11 @@ public interface SecretRetrievalStrategy {
public boolean retryOnFail() {
return false;
}
@Override
public boolean requiresUserInteraction() {
return false;
}
};
}
}
@ -95,6 +100,11 @@ public interface SecretRetrievalStrategy {
public boolean retryOnFail() {
return true;
}
@Override
public boolean requiresUserInteraction() {
return true;
}
};
}
}
@ -135,6 +145,11 @@ public interface SecretRetrievalStrategy {
public boolean retryOnFail() {
return false;
}
@Override
public boolean requiresUserInteraction() {
return false;
}
};
}
}
@ -170,6 +185,11 @@ public interface SecretRetrievalStrategy {
public boolean retryOnFail() {
return false;
}
@Override
public boolean requiresUserInteraction() {
return false;
}
};
}
}