Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

client

Clone or download

Somewhat storage support for iOS

Download Browse
+31 −3
Debayan Sutradhar (rnayabed) 2021-03-06 11:00
Debayan Sutradhar (rnayabed) 2021-03-06 11:00
9e252b0f51f3c5b9ea3223b92ebf3b548cc84709
d5f0058a90bc60d9a430954325f0b6c91e257618
git #client/9e252b0f51f3c5b9ea3223b92ebf3b548cc84709

Modified Files

List
Side by side diff
M pom.xml
+6 −0
--- 'a/pom.xml'
+++ b/pom.xml
@@ -72,6 +72,11 @@
<artifactId>util</artifactId>
<version>4.0.10</version>
</dependency>
+ <dependency>
+ <groupId>com.gluonhq.attach</groupId>
+ <artifactId>storage</artifactId>
+ <version>4.0.10</version>
+ </dependency>
</dependencies>
<repositories>
@@ -118,6 +123,7 @@
</bundlesList>
<attachList>
<list>lifecycle</list>
+ <list>storage</list>
</attachList>
<reflectionList>
<list>java.util.logging.FileHandler</list>
M src/main/java/com/stream_pi/client/info/ClientInfo.java
+23 −1
--- 'a/src/main/java/com/stream_pi/client/info/ClientInfo.java'
+++ b/src/main/java/com/stream_pi/client/info/ClientInfo.java
@@ -8,6 +8,7 @@ Contributors: Debayan Sutradhar (@dubbad
package com.stream_pi.client.info;
+import com.gluonhq.attach.storage.StorageService;
import com.stream_pi.util.exception.MinorException;
import com.stream_pi.util.platform.Platform;
import com.stream_pi.util.platform.ReleaseStatus;
@@ -56,9 +57,30 @@ public class ClientInfo {
}
else if(osName.contains("android")) // SPECIFY -Dsvm.targetName=android WHILE BUILDING ANDROID NATIVE IMAGE
{
- prePath = "/sdcard/Android/data/com.stream_pi.client/";
+ StorageService.create().ifPresent(s->{
+ s.getPublicStorage("Documents").ifPresentOrElse(sp->{
+ prePath = sp.getAbsolutePath()+"/Stream-Pi/Client/";
+ }, ()->
+ {
+ prePath = null;
+ });
+ });
+
platformType = Platform.ANDROID;
}
+ else if(osName.contains("ios")) // SPECIFY -Dsvm.targetName=ios WHILE BUILDING ANDROID NATIVE IMAGE
+ {
+ StorageService.create().ifPresent(s->{
+ s.getPrivateStorage().ifPresentOrElse(sp->{
+ prePath = sp.getAbsolutePath()+"/Stream-Pi/Client/";
+ }, ()->
+ {
+ prePath = null;
+ });
+ });
+
+ platformType = Platform.IOS;
+ }
else if (osName.contains("mac"))
{
platformType = Platform.MAC;
M src/main/java/com/stream_pi/client/window/Base.java
+1 −2
--- 'a/src/main/java/com/stream_pi/client/window/Base.java'
+++ b/src/main/java/com/stream_pi/client/window/Base.java
@@ -253,8 +253,7 @@ public abstract class Base extends Stack
{
try
{
- File filex = new File(ClientInfo.getInstance().getPrePath());
-
+ File filex = new File(getClientInfo().getPrePath());
if(!filex.exists())
{
M src/main/java/module-info.java
+1 −0
--- 'a/src/main/java/module-info.java'
+++ b/src/main/java/module-info.java
@@ -7,6 +7,7 @@ module com.stream_pi.client {
requires com.gluonhq.attach.lifecycle;
requires com.gluonhq.attach.util;
+ requires com.gluonhq.attach.storage;
requires java.xml;