Finish release/v2.0.1

Finish release/v2.0.1

Author: dragos-dobre

General/src/main/java/org/openimis/general/General.java

@@ -62,7 +62,8 @@ public void ChangeLanguage(Context ctx,String Language){
 		res.updateConfiguration(config, dm);
 	}
 
-	public String getVersion(Context ctx, String PackageName){
+	// ToDo: remove this method if published to Google Play
+	/*public String getVersion(Context ctx, String PackageName){
 		String VersionName = "";
 
 		PackageManager manager = ctx.getPackageManager();
@@ -77,9 +78,10 @@ public String getVersion(Context ctx, String PackageName){
 		}
 		return VersionName;
 
-	}
+	}*/
 
-	public String getFromRestApi(final String functionName) {
+	// ToDo: remove this method if published to Google Play
+	/*public String getFromRestApi(final String functionName) {
 		String uri = getDomain()+ "api/";
 
 		final String[] content = {null};
@@ -102,14 +104,16 @@ public String getFromRestApi(final String functionName) {
 			}
 		}
 		return content[0];
-	}
+	}*/
 
+	// ToDo: depricate/remove this method if published to Google Play
 	public boolean isNewVersionAvailable(String Field,Context ctx, String PackageName){
-		String result = getFromRestApi("system/apkversion/" + Field);
-		if(result.contains(",")) {
-			result = result.replaceAll("(\\d+)\\,(\\d+)", "$1.$2");
-		}
-		return result == ""?false:Float.parseFloat(this.getVersion(ctx, PackageName).toString()) < Float.parseFloat(result);
+		//String result = getFromRestApi("system/apkversion/" + Field);
+		//if(result.contains(",")) {
+		//	result = result.replaceAll("(\\d+)\\,(\\d+)", "$1.$2");
+		//}
+		// return result == ""?false:Float.parseFloat(this.getVersion(ctx, PackageName)) < Float.parseFloat(result);
+		return false;
 	}
 }
 

claimManagement/build.gradle

@@ -5,10 +5,11 @@ android {
     defaultConfig {
         applicationId "org.openimis.imisclaims"
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 2
-        versionName "2.0"
+        targetSdkVersion 27
+        versionCode 3
+        versionName "2.0.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        useLibrary 'org.apache.http.legacy'
     }
     buildTypes {
         release {

claimManagement/src/main/AndroidManifest.xml

@@ -21,6 +21,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:replace="android:icon">
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <activity
             android:name="org.openimis.imisclaims.MainActivity"
             android:label="@string/app_name"