Merge pull request #227 from mngoe/feature-35766

Fix download master data process

Author: zikani03

app/src/localeMv/res/values-fr/strings.xml

@@ -482,4 +482,5 @@
     <string name="pay_type_cash">Cash</string>
     <string name="pay_type_mobile_phone">Téléphone portable</string>
     <string name="pay_type_bank_transfer">Virement banquaire</string>
+    <string name="Close">Fermer</string>
 </resources>

app/src/localeMv/res/values/strings.xml

@@ -477,4 +477,5 @@
     <string name="CurrentResourceLanguage">Current resource language: %1$s</string>
     <string name="SystemLanguageNotSupported">Current system language is not supported. The app will use the default language.</string>
     <string name="SupportedLanguages">Supported languages:\n%1$s</string>
+    <string name="Close">Close</string>
 </resources>

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

@@ -50,6 +50,7 @@
 import android.view.View;
 import android.view.WindowManager;
 import android.webkit.JavascriptInterface;
+import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -5179,32 +5180,44 @@ public void showLoginDialogBox(@Nullable final Runnable onSuccess, @Nullable fin
         alertDialogBuilder.setView(promptsView);
         alertDialogBuilder
                 .setCancelable(false)
-                .setPositiveButton(
-                        R.string.Ok,
-                        (dialog, id) -> {
-                            if (!username.getText().toString().equals("") || !password.getText().toString().equals("")) {
-                                boolean isUserLogged = LoginToken(username.getText().toString(), password.getText().toString());
-                                if (isUserLogged) {
-                                    if (onSuccess != null) {
-                                        onSuccess.run();
-                                    }
-                                } else {
-                                    AndroidUtils.showConfirmDialog(
-                                            activity, R.string.LoginFail,
-                                            (d, w) -> {
-                                                if (onError != null) {
-                                                    onError.run();
-                                                }
-                                            }
-                                    );
-                                }
-                            } else {
-                                Toast.makeText(activity, "Please enter user name and password", Toast.LENGTH_LONG).show();
-                            }
-                        });
+                .setPositiveButton(R.string.Ok,null)
+                .setNegativeButton(R.string.Close, (d, which) -> {
+                    activity.finish();
+                });
 
         // create alert dialog
         AlertDialog alertDialog = alertDialogBuilder.create();
+        alertDialog.setOnShowListener(d -> {
+            Button okButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+            okButton.setOnClickListener(v -> {
+                String user = username.getText().toString().trim();
+                String pass = password.getText().toString().trim();
+                if (user.isEmpty() || pass.isEmpty()) {
+                    Toast.makeText(activity,
+                            "Please enter user name and password",
+                            Toast.LENGTH_LONG).show();
+                    return;
+                }
+
+                boolean isUserLogged = LoginToken(user, pass);
+                if (isUserLogged) {
+                    alertDialog.dismiss();
+                    if (onSuccess != null) {
+                        onSuccess.run();
+                    }
+                } else {
+                    AndroidUtils.showConfirmDialog(
+                            activity,
+                            R.string.LoginFail,
+                            (d2, w) -> {
+                                if (onError != null) {
+                                    onError.run();
+                                }
+                            }
+                    );
+                }
+            });
+        });
 
         // show it
         alertDialog.show();

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

@@ -824,7 +824,7 @@ protected void onPostExecute(Throwable exception) {
                 return;
             }
             if (exception instanceof UserNotAuthenticatedException) {
-                new ClientAndroidInterface(context).forceLoginDialogBox(() -> restart(context));
+                new ClientAndroidInterface(context).forceLoginDialogBox(() -> startDownloading());
                 return;
             }
             restart(context);
@@ -835,6 +835,10 @@ private void restart(@NonNull Activity activity) {
             activity.startActivity(refresh);
             activity.finish();
         }
+
+        private void startDownloading(){
+            new MasterDataAsync(activity.get()).execute();
+        }
     }
 
     public static class MasterDataLocalAsync extends AsyncTask<String, Void, Void> {

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.ajoberstar.grgit:grgit-gradle:4.1.1"
         classpath 'com.apollographql.apollo:apollo-gradle-plugin:2.5.14'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip