OTC-347: Add token management (similar to Policies app) in Claims app

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
 
 
         // NOTE: Do not place your application dependencies here; they belong

claimManagement/build.gradle

@@ -48,6 +48,7 @@ android {
         resValue "string", "ReleaseDateValue", getDate()
         buildConfigField "String", "API_BASE_URL", '"http://demo.openimis.org/rest/"'
         buildConfigField "String", "RAR_PASSWORD", '")(#$1HsD"'
+        buildConfigField "String", "API_VERSION", '"3"'
     }
 
     productFlavors {
@@ -121,28 +122,23 @@ android {
         exclude 'META-INF/DEPENDENCIES'
 
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    //implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:support-annotations:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
     implementation 'com.google.zxing:core:3.3.0'
     implementation 'com.embarkmobile:zxing-android-minimal:1.2.1@aar'
+    implementation 'com.android.support:design:28.0.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    // https://mvnrepository.com/artifact/com.squareup.picasso/picasso
     implementation group: 'com.squareup.picasso', name: 'picasso', version: '2.5.2'
-    // https://mvnrepository.com/artifact/net.lingala.zip4j/zip4j
     implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.2.7'
-    // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore
-    //implementation group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.1'
-    // https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient
-//    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.4.1'
-    implementation "cz.msebera.android:httpclient:4.4.1.2"
 
 }

claimManagement/proguard-rules.pro

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\Hiren\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

claimManagement/src/local/java/org/openimis/imisclaims/Escape.java

@@ -2,12 +2,6 @@
 
 public class Escape {
     public boolean CheckCHFID(String InsureeNumber) {
-        if (InsureeNumber.length() != 9) return false;
-        int actualControlNumber, expectedControlNumber;
-
-        expectedControlNumber = Integer.parseInt(InsureeNumber.substring(8));
-        actualControlNumber = Integer.parseInt(InsureeNumber.substring(0, 8)) % 7;
-
-        return expectedControlNumber == actualControlNumber;
+        return InsureeNumber != null && InsureeNumber.length() != 0;
     }
 }

claimManagement/src/main/AndroidManifest.xml

@@ -12,24 +12,35 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
-
-    <uses-permission android:name="android.permission.READ_CALL_LOG" tools:node="remove" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" tools:node="remove" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.READ_CALL_LOG"
+        tools:node="remove" />
+    <uses-permission
+        android:name="android.permission.READ_CONTACTS"
+        tools:node="remove" />
 
     <application
-        android:name="org.openimis.imisclaims.Global"
+        android:name=".Global"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher_round"
         android:label="@string/app_name_claims"
+        android:requestLegacyExternalStorage="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:requestLegacyExternalStorage="true"
         tools:replace="android:icon,android:label">
-        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        <service
+            android:name=".SynchronizeService"
+            android:exported="false" />
+
+        <uses-library
+            android:name="org.apache.http.legacy"
+            android:required="false" />
+
         <activity
-            android:name="org.openimis.imisclaims.MainActivity"
+            android:name=".MainActivity"
             android:label="@string/app_name_claims"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
@@ -39,61 +50,52 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="org.openimis.imisclaims.EnquireActivity"
+            android:name=".EnquireActivity"
             android:label="@string/title_activity_enquire"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name="org.openimis.imisclaims.ClaimActivity"
+            android:name=".ClaimActivity"
             android:windowSoftInputMode="stateHidden" />
         <activity
-            android:name="org.openimis.imisclaims.AddItems"
+            android:name=".AddItems"
             android:label="@string/AddItems"
             android:windowSoftInputMode="stateHidden" />
         <activity
-            android:name="org.openimis.imisclaims.AddServices"
+            android:name=".AddServices"
             android:label="@string/AddServices"
             android:windowSoftInputMode="stateHidden" />
         <activity
-            android:name="org.openimis.imisclaims.MapItems"
+            android:name=".MapItems"
             android:label="@string/MapItems"
             android:windowSoftInputMode="stateHidden" />
         <activity
-            android:name="org.openimis.imisclaims.MapServices"
+            android:name=".MapServices"
             android:label="@string/MapServices"
             android:windowSoftInputMode="stateHidden" />
-        <activity android:name="org.openimis.imisclaims.Synchronize" />
-        <activity android:name="org.openimis.imisclaims.About" />
-        <activity android:name="org.openimis.imisclaims.Settings"/>
+        <activity android:name=".SynchronizeActivity" />
+        <activity android:name=".About" />
+        <activity android:name=".SettingsActivity" />
         <activity
-            android:name="org.openimis.imisclaims.Report"
+            android:name=".Report"
             android:label="@string/title_activity_report"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name="com.google.zxing.client.android.CaptureActivity"
-            android:screenOrientation="landscape"
+        <activity
+            android:name="com.google.zxing.client.android.CaptureActivity"
             android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="landscape"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
             android:windowSoftInputMode="stateAlwaysHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="com.google.zxing.client.android.SCAN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
         </activity>
+
         <uses-library
             android:name="org.apache.http.legacy"
-            android:required="false"/>
-
-        <activity android:name=".SearchClaims" />
-        <activity android:name=".Claims">
+            android:required="false" />
 
-        </activity>
+        <activity android:name=".SearchClaimsActivity" />
+        <activity android:name=".Claims" />
         <activity
             android:name=".ClaimReview"
-            android:label="@string/title_activity_claim_review">
-        </activity>
+            android:label="@string/title_activity_claim_review" />
     </application>
 
 </manifest>

claimManagement/src/main/java/org/openimis/imisclaims/ClaimActivity.java

@@ -188,45 +188,30 @@ protected void onCreate(Bundle savedInstanceState) {
         etDiagnosis4.setThreshold(1);
         etDiagnosis4.setOnItemClickListener(adapter);
 
-        etStartDate.setOnTouchListener(new View.OnTouchListener() {
-
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                showDialog(StartDate_Dialog_ID);
-                return false;
-            }
+        etStartDate.setOnTouchListener((v, event) -> {
+            showDialog(StartDate_Dialog_ID);
+            return false;
         });
 
-        etEndDate.setOnTouchListener(new View.OnTouchListener() {
-
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                showDialog(EndDate_Dialog_ID);
-                return false;
-            }
+        etEndDate.setOnTouchListener((v, event) -> {
+            showDialog(EndDate_Dialog_ID);
+            return false;
         });
 
 
-        btnNew.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                if (TotalItemService>0){
-                    ConfirmDialog(getResources().getString(R.string.ConfirmDiscard));
-                }else{
-                    ClearForm();
-                }
+        btnNew.setOnClickListener(v -> {
+            if (TotalItemService>0){
+                ConfirmDialog(getResources().getString(R.string.ConfirmDiscard));
+            }else{
+                ClearForm();
             }
         });
 
-        btnScan.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent("com.google.zxing.client.android.SCAN");
-                intent.putExtra("SCAN_MODE", "QR_CODE_MODE");
-                startActivityForResult(intent, 1);
-            }
+        btnScan.setOnClickListener(v -> {
+            Intent scanIntent = new Intent(this,com.google.zxing.client.android.CaptureActivity.class);
+            scanIntent.setAction("com.google.zxing.client.android.SCAN");
+            scanIntent.putExtra("SCAN_MODE", "QR_CODE_MODE");
+            startActivityForResult(scanIntent, 1);
         });
 
         btnPost.setOnClickListener(new View.OnClickListener() {