Fix su null della variabile Server in Login
This commit is contained in:
parent
9436236eaa
commit
0aa0b09afa
@ -30,6 +30,7 @@ pipeline {
|
||||
stage('Build') {
|
||||
steps {
|
||||
bat "./gradlew assembleRelease"
|
||||
bat "./gradlew app:uploadCrashlyticsSymbolFileRelease"
|
||||
archiveArtifacts artifacts: 'app/build/outputs/apk/release/', onlyIfSuccessful: true
|
||||
}
|
||||
}
|
||||
|
||||
@ -39,8 +39,6 @@ public class SettingsManager {
|
||||
private static SettingsModel settingsModelIstance;
|
||||
private static DBSettingsModel dbSettingsModelIstance;
|
||||
|
||||
private static boolean firstStart = false;
|
||||
|
||||
private static Context mContext;
|
||||
private static SystemRESTConsumer mSystemRESTConsumer;
|
||||
private static ImballiRESTConsumer mImballiRESTConsumer;
|
||||
@ -65,15 +63,15 @@ public class SettingsManager {
|
||||
public void init() {
|
||||
settingsModelIstance = (SettingsModel) Stash.getObject(TAG, SettingsModel.class);
|
||||
|
||||
if (settingsModelIstance == null) {
|
||||
if (settingsModelIstance == null)
|
||||
settingsModelIstance = new SettingsModel();
|
||||
|
||||
|
||||
if (settingsModelIstance.getServer() == null)
|
||||
settingsModelIstance.setServer(new SettingsModel.Server());
|
||||
firstStart = true;
|
||||
}
|
||||
|
||||
|
||||
dbSettingsModelIstance = new DBSettingsModel();
|
||||
|
||||
}
|
||||
|
||||
public SettingsModel getSettings() {
|
||||
@ -89,10 +87,6 @@ public class SettingsManager {
|
||||
return dbSettingsModelIstance;
|
||||
}
|
||||
|
||||
public static boolean isFirstStart() {
|
||||
return firstStart;
|
||||
}
|
||||
|
||||
public static boolean isInstanceAvailable() {
|
||||
return i() != null;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user