Dark98/SliceBeam
1
0
Fork 0
mirror of https://github.com/Dark98/SliceBeam.git synced 2026-07-03 16:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

PlayStore & Debug Build Changes

Browse Source 
*Updated Icon
*Upgraded NDK to 29.0.14206865
*Rebuilt Libs To 16KB Page Sizr Compatible
*Updated Debug APK Name And Package
This commit is contained in:
Dark98
2026-02-11 21:44:30 +00:00
parent d37c099060
commit bb07740d43
52 changed files with 158 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/dark98/santoku/SetupActivity.java
+6 -1
View File
@@ -898,9 +898,14 @@ public class SetupActivity extends AppCompatActivity {
Toast.makeText(ctx, R.string.SettingsCloudManageSignUpMissingFields, Toast.LENGTH_SHORT).show();
return;
}
CloudAPI api = CloudController.getApiSafe();
if (api == null) {
Toast.makeText(ctx, R.string.SettingsCloudManageSignUpFailed, Toast.LENGTH_SHORT).show();
return;
}
signUpInProgress = true;
bindLoginButton(true);
CloudAPI.INSTANCE.signup(email, password, displayName, new APICallback<CloudAPI.AuthToken>() {
api.signup(email, password, displayName, new APICallback<CloudAPI.AuthToken>() {
@Override
public void onResponse(CloudAPI.AuthToken response) {
Prefs.setCloudAPIToken(response.bearer);
app/src/main/java/com/dark98/santoku/boot/EventBusTask.java
+7 -1
View File
@@ -6,7 +6,13 @@ import com.dark98.santoku.BuildConfig;
public class EventBusTask extends BootTask {
public EventBusTask() {
super(() -> EventBus.registerImpl(BuildConfig.APPLICATION_ID));
super(() -> {
String appId = BuildConfig.APPLICATION_ID;
if (BuildConfig.DEBUG && appId.endsWith(".debug")) {
appId = appId.substring(0, appId.length() - ".debug".length());
}
EventBus.registerImpl(appId);
});
onWorker();
}
}
app/src/main/java/com/dark98/santoku/cloud/CloudAPI.java
+5
View File
@@ -38,6 +38,11 @@ public interface CloudAPI extends APIRunner {
}
return headers;
}
@Override
public ru.ytkab0bp.sapil.util.Pair<String, String> getNamingTransformPolicy() {
return null;
}
});
/**
app/src/main/java/com/dark98/santoku/cloud/CloudController.java
+54 -8
View File
@@ -51,7 +51,14 @@ public class CloudController {
private static Runnable loginCheck = new Runnable() {
@Override
public void run() {
CloudAPI.INSTANCE.loginCheck(loginSessionId, new APICallback<CloudAPI.LoginState>() {
CloudAPI api = getApiSafe();
if (api == null) {
loginSessionId = null;
isLoggingIn = false;
Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent());
return;
}
api.loginCheck(loginSessionId, new APICallback<CloudAPI.LoginState>() {
@Override
public void onResponse(CloudAPI.LoginState response) {
if (response.loggedIn) {
@@ -77,6 +84,15 @@ public class CloudController {
private static Gson gson = new Gson();
public static CloudAPI getApiSafe() {
try {
return CloudAPI.INSTANCE;
} catch (Throwable t) {
Log.e(TAG, "Cloud API unavailable", t);
return null;
}
}
public static void initCached() {
if (Prefs.getCloudAPIToken() != null) {
if (Prefs.getCloudCachedUserInfo() != null) {
@@ -101,7 +117,11 @@ public class CloudController {
}
private static void loadUserInfo() {
CloudAPI.INSTANCE.userGetInfo(new APICallback<CloudAPI.UserInfo>() {
CloudAPI api = getApiSafe();
if (api == null) {
return;
}
api.userGetInfo(new APICallback<CloudAPI.UserInfo>() {
@Override
public void onResponse(CloudAPI.UserInfo response) {
userInfo = response;
@@ -145,7 +165,13 @@ public class CloudController {
}
private static void beginLogin0() {
beginLoginHandle = CloudAPI.INSTANCE.loginBegin(new APICallback<CloudAPI.LoginData>() {
CloudAPI api = getApiSafe();
if (api == null) {
isLoggingIn = false;
Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent());
return;
}
beginLoginHandle = api.loginBegin(new APICallback<CloudAPI.LoginData>() {
@Override
public void onResponse(CloudAPI.LoginData response) {
loginSessionId = response.sessionId;
@@ -172,7 +198,10 @@ public class CloudController {
isLoggingIn = false;
Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent());
if (loginSessionId != null) {
CloudAPI.INSTANCE.loginCancel(loginSessionId, response -> {});
CloudAPI api = getApiSafe();
if (api != null) {
api.loginCancel(loginSessionId, response -> {});
}
}
if (beginLoginHandle != null && beginLoginHandle.isRunning()) {
beginLoginHandle.cancel();
@@ -184,7 +213,10 @@ public class CloudController {
}
public static void logout() {
CloudAPI.INSTANCE.logout(response -> {});
CloudAPI api = getApiSafe();
if (api != null) {
api.logout(response -> {});
}
Prefs.setCloudAPIToken(null);
userInfo = null;
Santoku.EVENT_BUS.fireEvent(new CloudLoginStateUpdatedEvent());
@@ -204,7 +236,12 @@ public class CloudController {
}
private static void downloadData(long lastModified) {
CloudAPI.INSTANCE.syncGet(new APICallback<String>() {
CloudAPI api = getApiSafe();
if (api == null) {
isSyncInProgress = false;
return;
}
api.syncGet(new APICallback<String>() {
@Override
public void onResponse(String response) {
IOUtils.IO_POOL.submit(() -> {
@@ -251,11 +288,15 @@ public class CloudController {
if (isSyncInProgress) {
return;
}
CloudAPI api = getApiSafe();
if (api == null) {
return;
}
long modified = Prefs.getCloudLocalLastModified();
isSyncInProgress = true;
Santoku.EVENT_BUS.fireEvent(new NeedSnackbarEvent(SnackbarsLayout.Type.LOADING, R.string.CloudSyncInProgress).tag(CLOUD_SYNC_TAG));
CloudAPI.INSTANCE.syncGetState(new APICallback<CloudAPI.SyncState>() {
api.syncGetState(new APICallback<CloudAPI.SyncState>() {
@Override
public void onResponse(CloudAPI.SyncState response) {
if (Santoku.CONFIG == null && response.usedSize != 0) {
@@ -324,7 +365,12 @@ public class CloudController {
bos.close();
fis.close();
CloudAPI.INSTANCE.syncUpload(Base64.encodeToString(bos.toByteArray(), Base64.NO_WRAP), "application/ini", new APICallback<CloudAPI.SyncState>() {
CloudAPI api = getApiSafe();
if (api == null) {
isSyncInProgress = false;
return;
}
api.syncUpload(Base64.encodeToString(bos.toByteArray(), Base64.NO_WRAP), "application/ini", new APICallback<CloudAPI.SyncState>() {
@Override
public void onResponse(CloudAPI.SyncState response) {
isSyncInProgress = false;
app/src/main/java/com/dark98/santoku/config/ConfigObject.java
+1 -1
View File
@@ -81,7 +81,7 @@ public class ConfigObject implements ProfileListFragment.ProfileListItem {
public String serialize() {
StringBuilder sb = new StringBuilder();
sb.append("# generated by Slice Beam ").append(BuildConfig.VERSION_NAME).append("\n\n");
sb.append("# generated by Santoku ").append(BuildConfig.VERSION_NAME).append("\n\n");
for (Map.Entry<String, String> en : values.entrySet()) {
String value = en.getValue();
if (value != null) {
app/src/main/java/com/dark98/santoku/slic3r/Slic3rConfigWrapper.java
+1 -1
View File
@@ -214,7 +214,7 @@ public class Slic3rConfigWrapper {
public String serialize() {
StringBuilder sb = new StringBuilder();
sb.append("# generated by Slice Beam ").append(BuildConfig.VERSION_NAME).append("\n\n");
sb.append("# generated by Santoku ").append(BuildConfig.VERSION_NAME).append("\n\n");
serializeList(sb, "printer", printerConfigs);
serializeList(sb, "print", printConfigs);
serializeList(sb, "filament", filamentConfigs);
app/src/main/java/com/dark98/santoku/slic3r/Slic3rLocalization.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class Slic3rLocalization {
}
private static String replaceStr(String val) {
return val.replace("\\n", "\n").replaceAll("\\\\(.)", "$1").replace("Slic3r", "Slice Beam").replace("PrusaSlicer", "Slice Beam");
return val.replace("\\n", "\n").replaceAll("\\\\(.)", "$1").replace("Slic3r", "Santoku").replace("PrusaSlicer", "Santoku");
}
public static String getString(String key) {