Merge pull request #78 from openimis/feature/OP-197

delcroip · web-flow · commit 9ae73e69dd95 · 2022-11-10T15:03:32.000+01:00
OP-197: Offline initialization of app is now possible.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/MainActivity.java
@@ -1,10 +1,12 @@
 package org.openimis.imisclaims;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.ProgressDialog;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -29,6 +31,7 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.net.Uri;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -37,17 +40,25 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.openimis.imisclaims.claimlisting.ClaimListingActivity;
+import org.openimis.imisclaims.tools.Log;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.Locale;
 
+import org.apache.commons.io.IOUtils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
 
 public class MainActivity extends ImisActivity {
     private static final int REQUEST_PERMISSIONS_CODE = 1;
     private static final int REQUEST_ALL_FILES_ACCESS_CODE = 2;
+    private static final String LOG_TAG = "MainActivity";
     ArrayList<String> broadcastList;
     final CharSequence[] lang = {"English", "Francais"};
     String Language;
@@ -67,6 +78,7 @@ public class MainActivity extends ImisActivity {
     final String VersionField = "AppVersionEnquire";
     NotificationManager mNotificationManager;
     final int SIMPLE_NOTIFICATION_ID = 1;
+    private static final int REQUEST_PICK_MD_FILE = 3;
     Vibrator vibrator;
 
     @Override
@@ -250,13 +262,56 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        File databaseFile;
+
         if (requestCode == REQUEST_ALL_FILES_ACCESS_CODE) {
             if (checkRequirements()) {
                 onAllRequirementsMet();
             }
+        } else if (requestCode == REQUEST_PICK_MD_FILE) {
+            if (resultCode == RESULT_OK && data != null) {
+                Uri uri = data.getData();
+                if (uri != null) {
+                    try {
+                        byte[] bytes = IOUtils.toByteArray(getContentResolver().openInputStream(uri));
+                        databaseFile = new File(SQLHandler.DB_NAME_DATA);
+                        if (databaseFile.exists() || databaseFile.createNewFile()) {
+                            new FileOutputStream(databaseFile).write(bytes);
+                            onAllRequirementsMet();
+                        } else {
+                            showDialog(getResources().getString(R.string.ImportMasterDataFailed),
+                                    (d, i) -> finish());
+                        }
+                    } catch (Exception e) {
+                        Log.e(LOG_TAG, "Error while copying master data.", e);
+                    }
+                }
+            }
         }
     }
 
+    public void PickMasterDataFileDialog() {
+        new AlertDialog.Builder(MainActivity.this)
+                .setTitle(getResources().getString(R.string.NoInternetTitle))
+                .setMessage(getResources().getString(R.string.DoImportClaimsMasterData))
+                .setCancelable(false)
+                .setPositiveButton(getResources().getString(R.string.Yes),
+                        (dialog, which) -> {
+                            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+                            intent.addCategory(Intent.CATEGORY_OPENABLE);
+                            intent.setType("*/*");
+                            try {
+                                startActivityForResult(intent, REQUEST_PICK_MD_FILE);
+                            } catch (ActivityNotFoundException e) {
+                                Toast.makeText(getApplicationContext(), getResources().getString(R.string.NoFileExporerInstalled), Toast.LENGTH_SHORT).show();
+                            }
+                        }).setNegativeButton(getResources().getString(R.string.No),
+                        (dialog, id) -> {
+                            dialog.cancel();
+                            finish();
+                        }).show();
+    }
+
     public AlertDialog confirmRefreshMap() {
         return showDialog(
                 getResources().getString(R.string.AreYouSure),
@@ -990,8 +1045,11 @@ public boolean checkRequirements() {
             if (global.isNetworkAvailable()) {
                 sqlHandler.createOrOpenDatabases();
                 sqlHandler.createTables();
+                sqlHandler.createMappingTables();
                 initializeDb3File(sqlHandler);
             } else {
+                sqlHandler.createMappingTables();
+                PickMasterDataFileDialog();
                 showToast(R.string.CheckInternet);
             }
 
@@ -1007,4 +1065,5 @@ public void onAllRequirementsMet() {
         }
         refreshCount();
     }
-}
+
+}
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java b/claimManagement/src/main/java/org/openimis/imisclaims/SQLHandler.java
@@ -317,7 +317,9 @@ public void createTables() {
                 Log.e("SQL", "Error while excecutiong executing command: " + command, e);
             }
         }
+    }
 
+    public void createMappingTables() {
         String[] commandsMapping = {CreateTableMapping};
         for (String command : commandsMapping) {
             try {
@@ -629,4 +631,5 @@ public String getReferenceName(@NonNull String referenceCode) {
             return REFERENCE_UNKNOWN;
         }
     }
+
 }
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java b/claimManagement/src/main/java/org/openimis/imisclaims/ToRestApi.java
@@ -131,6 +131,7 @@ public String getHttpError(Context context, int httpResponseCode, String httpRea
         }
     }
 
+
     public String getPayloadError(String responseContent) {
         String payloadError = null;
 
@@ -145,4 +146,5 @@ public String getPayloadError(String responseContent) {
         return payloadError;
     }
 
+
 }
diff --git a/claimManagement/src/main/res/values/strings.xml b/claimManagement/src/main/res/values/strings.xml
@@ -224,5 +224,10 @@
     <string name="Forbidden">You are not allowed to take this action.</string>
     <string name="UnknownError">Unknown Error.</string>
     <string name="NotFound">Entry does not exist.</string>
+    <string name="NoFileExporerInstalled">There are no file explorer clients installed.</string>
+    <string name="DoImportClaimsMasterData">Do you want to import master data as file?</string>
+    <string name="NoInternetTitle">NO INTERNET CONNECTION</string>
+    <string name="ImportMasterDataFailed">Failed to read master data from file.</string>
     <string name="HttpResponse">HTTP response: %1$d — %2$s</string>
+
 </resources>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Dec 03 10:17:47 CET 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`mavenCentral()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:7.2.1'`
	`10`	`+ classpath 'com.android.tools.build:gradle:7.3.1'`
`11`	`11`
`12`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
`13`	`13`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,9 @@ public void createTables() {`
`317`	`317`	`Log.e("SQL", "Error while excecutiong executing command: " + command, e);`
`318`	`318`	`}`
`319`	`319`	`}`
	`320`	`+ }`
`320`	`321`
	`322`	`+ public void createMappingTables() {`
`321`	`323`	`String[] commandsMapping = {CreateTableMapping};`
`322`	`324`	`for (String command : commandsMapping) {`
`323`	`325`	`try {`
`@@ -629,4 +631,5 @@ public String getReferenceName(@NonNull String referenceCode) {`
`629`	`631`	`return REFERENCE_UNKNOWN;`
`630`	`632`	`}`
`631`	`633`	`}`
	`634`	`+`
`632`	`635`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ public String getHttpError(Context context, int httpResponseCode, String httpRea`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
	`134`	`+`
`134`	`135`	`public String getPayloadError(String responseContent) {`
`135`	`136`	`String payloadError = null;`
`136`	`137`
`@@ -145,4 +146,5 @@ public String getPayloadError(String responseContent) {`
`145`	`146`	`return payloadError;`
`146`	`147`	`}`
`147`	`148`
	`149`	`+`
`148`	`150`	`}`