Skip to content

Commit 54627dd

Browse files
committed
fix download master data
1 parent 50a5dfe commit 54627dd

5 files changed

Lines changed: 11 additions & 4 deletions

File tree

app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5149,7 +5149,7 @@ public void showLoginDialogBox(@Nullable final Runnable onSuccess, @Nullable fin
51495149
.setPositiveButton(
51505150
R.string.Ok,
51515151
(dialog, id) -> {
5152-
if (!username.getText().toString().equals("") || !password.getText().toString().equals("")) {
5152+
if (!username.getText().toString().isEmpty() || !password.getText().toString().isEmpty()) {
51535153
boolean isUserLogged = LoginToken(username.getText().toString(), password.getText().toString());
51545154
if (isUserLogged) {
51555155
if (onSuccess != null) {

app/src/main/java/org/openimis/imispolicies/MainActivity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ protected void onPostExecute(Throwable exception) {
818818
return;
819819
}
820820
if (exception instanceof UserNotAuthenticatedException) {
821-
new ClientAndroidInterface(context).forceLoginDialogBox(() -> restart(context));
821+
new ClientAndroidInterface(context).forceLoginDialogBox(() -> startDownloading());
822822
return;
823823
}
824824
restart(context);
@@ -829,6 +829,10 @@ private void restart(@NonNull Activity activity) {
829829
activity.startActivity(refresh);
830830
activity.finish();
831831
}
832+
833+
private void startDownloading(){
834+
new MasterDataAsync(activity.get()).execute();
835+
}
832836
}
833837

834838
public static class MasterDataLocalAsync extends AsyncTask<String, Void, Void> {

app/src/main/java/org/openimis/imispolicies/usecase/Login.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ public Login(
5353

5454
@WorkerThread
5555
public void execute(@NonNull String username, @NonNull String password) throws Exception {
56+
if (Global.getGlobal().getOfficerCode() == null) {
57+
Global.getGlobal().setOfficerCode(username);
58+
}
5659
String officerCode = Global.getGlobal().getOfficerCode();
5760
if (officerCode == null) {
5861
throw new IllegalStateException("OfficerCode should not be null on login");

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99
}
1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.1.4'
11+
classpath 'com.android.tools.build:gradle:8.13.0'
1212
classpath "org.ajoberstar.grgit:grgit-gradle:4.1.1"
1313
classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.14'
1414
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip

0 commit comments

Comments
 (0)