diff --git a/build.gradle b/build.gradle index f21dfea608..4955c753c5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' + ext.kotlin_version = '1.6.21' ext.safeargs_version = '2.3.0' System.properties['com.android.build.gradle.overrideVersionCheck'] = 'true' repositories { google() - jcenter() + mavenCentral() maven { url "https://plugins.gradle.org/m2/" } } @@ -13,7 +13,6 @@ buildscript { classpath 'com.android.tools.build:gradle:4.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$safeargs_version" - classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.0") // TODO AC-861 //classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' @@ -27,7 +26,9 @@ buildscript { allprojects { repositories { google() - jcenter() + + mavenCentral() maven { url "https://jitpack.io" } + maven { url "https://maven.aliyun.com/repository/jcenter" } } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8f3f9be57a..70b6593c67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,5 @@ org.gradle.jvmargs=-Xmx4608m # org.gradle.parallel=true android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=true +org.gradle.java.home=/usr/lib/jvm/java-1.11.0-openjdk-amd64 diff --git a/openmrs-android-sdk/build.gradle b/openmrs-android-sdk/build.gradle index 2036c116df..859c7049a9 100644 --- a/openmrs-android-sdk/build.gradle +++ b/openmrs-android-sdk/build.gradle @@ -2,7 +2,6 @@ plugins { id 'com.android.library' id 'kotlin-android' id 'maven-publish' - id 'org.jetbrains.dokka' id 'kotlin-kapt' id 'dagger.hilt.android.plugin' } @@ -13,7 +12,7 @@ android { defaultConfig { minSdkVersion 17 - targetSdkVersion 29 + targetSdkVersion 34 versionCode 1 versionName "1.0" @@ -51,11 +50,11 @@ android { implementation 'com.google.code.gson:gson:2.8.5' // room - implementation 'androidx.room:room-runtime:2.3.0-alpha01' - implementation 'android.arch.persistence.room:rxjava2:1.1.1' + implementation 'androidx.room:room-runtime:2.4.3' + implementation 'androidx.room:room-rxjava2:2.4.3' //no inspection - kapt 'androidx.room:room-compiler:2.1.0-alpha04' + kapt 'androidx.room:room-compiler:2.4.3' // joda time implementation 'joda-time:joda-time:2.10.6' @@ -77,7 +76,7 @@ android { implementation "com.google.code.gson:gson:2.8.5" // Work Manager - implementation "androidx.work:work-runtime:2.3.4" + implementation "androidx.work:work-runtime:2.7.1" // test implementation testImplementation 'junit:junit:4.+' @@ -135,10 +134,3 @@ android { } } -dokkaHtml.configure { - dokkaSourceSets { - named("main") { - noAndroidSdkLink.set(false) - } - } -} diff --git a/openmrs-android-sdk/src/main/java/com/openmrs/android_sdk/utilities/ApplicationConstants.kt b/openmrs-android-sdk/src/main/java/com/openmrs/android_sdk/utilities/ApplicationConstants.kt index cfbb1b99cd..4b9abcba0a 100644 --- a/openmrs-android-sdk/src/main/java/com/openmrs/android_sdk/utilities/ApplicationConstants.kt +++ b/openmrs-android-sdk/src/main/java/com/openmrs/android_sdk/utilities/ApplicationConstants.kt @@ -28,7 +28,7 @@ object ApplicationConstants { const val VISIT_TYPE_UUID = "visit_type_uuid" const val LAST_SESSION_TOKEN = "last_session_id" const val LAST_LOGIN_SERVER_URL = "last_login_server_url" - const val DEFAULT_OPEN_MRS_URL = "https://demo.openmrs.org/openmrs" + const val DEFAULT_OPEN_MRS_URL = "https://portal-qa.medihealthng.com/medihealth" const val DB_NAME = "openmrs.db" const val DB_PASSWORD_BCRYPT_PEPPER = "$2a$08\$iUp3M1VapYpjcAXQBNX6uu" const val DB_PASSWORD_LITERAL_PEPPER = "Open Sesame" diff --git a/openmrs-android-sdk/src/main/java/com/openmrs/android_sdk/utilities/ToastUtil.kt b/openmrs-android-sdk/src/main/java/com/openmrs/android_sdk/utilities/ToastUtil.kt index a60c3d7860..92b5cc9c60 100644 --- a/openmrs-android-sdk/src/main/java/com/openmrs/android_sdk/utilities/ToastUtil.kt +++ b/openmrs-android-sdk/src/main/java/com/openmrs/android_sdk/utilities/ToastUtil.kt @@ -99,8 +99,8 @@ object ToastUtil { } logger.d("Decode bitmap: $bitmap") val toast = Toast(context) - toast.view = toastRoot - toast.duration = duration + toast.setView(toastRoot) + toast.setDuration(duration) toast.show() val thread = ToastThread(duration) if (toastQueue.size == 0) { diff --git a/openmrs-android-sdk/versions.gradle b/openmrs-android-sdk/versions.gradle index bfbe7d2d73..faf0039fff 100644 --- a/openmrs-android-sdk/versions.gradle +++ b/openmrs-android-sdk/versions.gradle @@ -1,8 +1,8 @@ ext.versions = [:] -versions.compileSdk = 29 +versions.compileSdk = 31 versions.minSdk = 19 -versions.targetSdk = 29 +versions.targetSdk = 34 versions.appVersion = "2.9.0" // Libraries diff --git a/openmrs-client/build.gradle b/openmrs-client/build.gradle index f1f66abc98..2b60b6800e 100644 --- a/openmrs-client/build.gradle +++ b/openmrs-client/build.gradle @@ -160,7 +160,7 @@ dependencies { // Database components implementation "androidx.room:room-runtime:${versions.roomRuntime}" - implementation "android.arch.persistence.room:rxjava2:${versions.roomPersistence}" + implementation "androidx.room:room-rxjava2:${versions.roomPersistence}" // Noinspection GradleDependency annotationProcessor "androidx.room:room-compiler:${versions.roomCompiler}" @@ -231,7 +231,6 @@ dependencies { kaptTest "com.google.dagger:hilt-compiler:${versions.hilt}" // Leak Canary - debugImplementation "com.squareup.leakcanary:leakcanary-android:${versions.leakcanary}" // Debug database debugImplementation 'com.amitshekhar.android:debug-db:1.0.6' } diff --git a/openmrs-client/src/main/AndroidManifest.xml b/openmrs-client/src/main/AndroidManifest.xml index 673cf6017d..2b791dbfcd 100644 --- a/openmrs-client/src/main/AndroidManifest.xml +++ b/openmrs-client/src/main/AndroidManifest.xml @@ -21,6 +21,8 @@ + + + android:theme="@style/AppTheme" + android:exported="true"> @@ -63,7 +66,9 @@ - + @@ -120,6 +126,7 @@ android:name=".activities.activevisits.ActiveVisitsActivity" android:configChanges="keyboardHidden|screenSize" android:label="@string/action_active_visits" + android:exported="false" android:launchMode="singleTop" android:theme="@style/AppThemeOrig"> @@ -215,6 +222,7 @@ android:name=".activities.lastviewedpatients.LastViewedPatientsActivity" android:configChanges="keyboardHidden|screenSize" android:label="@string/action_download_patients" + android:exported="false" android:launchMode="singleTop" android:theme="@style/AppThemeOrig"> diff --git a/openmrs-client/src/main/java/org/openmrs/mobile/activities/ACBaseActivity.java b/openmrs-client/src/main/java/org/openmrs/mobile/activities/ACBaseActivity.java index 84a5d150ae..1b5eaa32a4 100644 --- a/openmrs-client/src/main/java/org/openmrs/mobile/activities/ACBaseActivity.java +++ b/openmrs-client/src/main/java/org/openmrs/mobile/activities/ACBaseActivity.java @@ -129,7 +129,11 @@ protected void onResume() { && !(this instanceof ContactUsActivity) && !(this instanceof SplashActivity)) { mAuthorizationManager.moveToLoginActivity(); } - registerReceiver(mPasswordChangedReceiver, mIntentFilter); + if (android.os.Build.VERSION.SDK_INT >= 33) { + registerReceiver(mPasswordChangedReceiver, mIntentFilter, 4 /* RECEIVER_NOT_EXPORTED */); + } else { + registerReceiver(mPasswordChangedReceiver, mIntentFilter); + } ToastUtil.setAppVisible(true); } diff --git a/openmrs-client/src/main/java/org/openmrs/mobile/application/OpenMRS.java b/openmrs-client/src/main/java/org/openmrs/mobile/application/OpenMRS.java index ff2e8b2e70..4e9aac9b86 100644 --- a/openmrs-client/src/main/java/org/openmrs/mobile/application/OpenMRS.java +++ b/openmrs-client/src/main/java/org/openmrs/mobile/application/OpenMRS.java @@ -46,7 +46,6 @@ public class OpenMRS extends MultiDexApplication implements Configuration.Provid public static OpenMRS getInstance() { return instance; } - @Override public void onCreate() { super.onCreate(); @@ -56,10 +55,20 @@ public void onCreate() { if (mExternalDirectoryPath == null) { mExternalDirectoryPath = this.getExternalFilesDir(null).toString(); } - Intent i = new Intent(this, FormListService.class); - startService(i); - Intent intent = new Intent(this, AuthenticateCheckService.class); - startService(intent); + + try { + Intent i = new Intent(this, FormListService.class); + startService(i); + } catch (Exception e) { + e.printStackTrace(); + } + + try { + Intent intent = new Intent(this, AuthenticateCheckService.class); + startService(intent); + } catch (Exception e) { + e.printStackTrace(); + } } @NotNull diff --git a/openmrs-client/src/main/java/org/openmrs/mobile/services/ConceptDownloadService.java b/openmrs-client/src/main/java/org/openmrs/mobile/services/ConceptDownloadService.java index 8a3f9186b5..1f7926eecd 100644 --- a/openmrs-client/src/main/java/org/openmrs/mobile/services/ConceptDownloadService.java +++ b/openmrs-client/src/main/java/org/openmrs/mobile/services/ConceptDownloadService.java @@ -103,7 +103,7 @@ private void showNotification(int downloadedConcepts) { Intent notificationIntent = new Intent(this, SettingsActivity.class); notificationIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); notificationIntent.putExtra(ApplicationConstants.BroadcastActions.CONCEPT_DOWNLOAD_BROADCAST_INTENT_KEY_COUNT, downloadedConcepts); - PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0); + PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE); Bitmap icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_openmrs); diff --git a/openmrs-client/src/main/java/org/openmrs/mobile/services/FormListService.java b/openmrs-client/src/main/java/org/openmrs/mobile/services/FormListService.java index 5122b6cd71..a6b1ccf623 100644 --- a/openmrs-client/src/main/java/org/openmrs/mobile/services/FormListService.java +++ b/openmrs-client/src/main/java/org/openmrs/mobile/services/FormListService.java @@ -54,7 +54,7 @@ protected void onHandleIntent(Intent intent) { formResourceDAO.addFormResource(formResourceEntity); } } catch (Exception e) { - ToastUtil.error(response.message()); + ToastUtil.error(response != null ? response.message() : e.getMessage()); } // Refresh encounter types EncounterTypeRoomDAO encounterTypeRoomDAO = appDatabase.encounterTypeRoomDAO(); @@ -68,7 +68,7 @@ protected void onHandleIntent(Intent intent) { encounterTypeRoomDAO.addEncounterType(encounterType); } } catch (Exception e) { - ToastUtil.error(response2.message()); + ToastUtil.error(response2 != null ? response2.message() : e.getMessage()); } } } diff --git a/openmrs-client/src/main/java/org/openmrs/mobile/utilities/ForceClose.kt b/openmrs-client/src/main/java/org/openmrs/mobile/utilities/ForceClose.kt index 7de7cfbd46..ad001a294a 100644 --- a/openmrs-client/src/main/java/org/openmrs/mobile/utilities/ForceClose.kt +++ b/openmrs-client/src/main/java/org/openmrs/mobile/utilities/ForceClose.kt @@ -62,6 +62,7 @@ class ForceClose @Inject constructor(private val context: Context) : Thread.Unca val i = context.packageManager.getLaunchIntentForPackage("org.openmrs.mobile") i?.putExtra("flag", true) i?.putExtra("error", errorReport.toString()) + i?.addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK) context.startActivity(i) Process.killProcess(Process.myPid()) exitProcess(10) diff --git a/openmrs-client/src/main/res/drawable-hdpi/ic_openmrs.png b/openmrs-client/src/main/res/drawable-hdpi/ic_openmrs.png index 06a5947bfa..878ffc47dd 100644 Binary files a/openmrs-client/src/main/res/drawable-hdpi/ic_openmrs.png and b/openmrs-client/src/main/res/drawable-hdpi/ic_openmrs.png differ diff --git a/openmrs-client/src/main/res/drawable-hdpi/openmrs_logo.png b/openmrs-client/src/main/res/drawable-hdpi/openmrs_logo.png index 910ecab39e..645f21762e 100644 Binary files a/openmrs-client/src/main/res/drawable-hdpi/openmrs_logo.png and b/openmrs-client/src/main/res/drawable-hdpi/openmrs_logo.png differ diff --git a/openmrs-client/src/main/res/drawable-mdpi/ic_openmrs.png b/openmrs-client/src/main/res/drawable-mdpi/ic_openmrs.png index 12fa97c72b..38871126ef 100644 Binary files a/openmrs-client/src/main/res/drawable-mdpi/ic_openmrs.png and b/openmrs-client/src/main/res/drawable-mdpi/ic_openmrs.png differ diff --git a/openmrs-client/src/main/res/drawable-mdpi/openmrs_logo.png b/openmrs-client/src/main/res/drawable-mdpi/openmrs_logo.png index 19ff0f5634..e5e5d2d47a 100644 Binary files a/openmrs-client/src/main/res/drawable-mdpi/openmrs_logo.png and b/openmrs-client/src/main/res/drawable-mdpi/openmrs_logo.png differ diff --git a/openmrs-client/src/main/res/drawable-xhdpi/ic_openmrs.png b/openmrs-client/src/main/res/drawable-xhdpi/ic_openmrs.png index 62dd7a04cd..e554078bf5 100644 Binary files a/openmrs-client/src/main/res/drawable-xhdpi/ic_openmrs.png and b/openmrs-client/src/main/res/drawable-xhdpi/ic_openmrs.png differ diff --git a/openmrs-client/src/main/res/drawable-xhdpi/openmrs_logo.png b/openmrs-client/src/main/res/drawable-xhdpi/openmrs_logo.png index 35468f9d03..772ef5a488 100644 Binary files a/openmrs-client/src/main/res/drawable-xhdpi/openmrs_logo.png and b/openmrs-client/src/main/res/drawable-xhdpi/openmrs_logo.png differ diff --git a/openmrs-client/src/main/res/drawable-xxhdpi/ic_openmrs.png b/openmrs-client/src/main/res/drawable-xxhdpi/ic_openmrs.png index b3901ad6df..7cd0621fda 100644 Binary files a/openmrs-client/src/main/res/drawable-xxhdpi/ic_openmrs.png and b/openmrs-client/src/main/res/drawable-xxhdpi/ic_openmrs.png differ diff --git a/openmrs-client/src/main/res/drawable-xxhdpi/openmrs_logo.png b/openmrs-client/src/main/res/drawable-xxhdpi/openmrs_logo.png index 2b94a34e9a..acb88bd25d 100644 Binary files a/openmrs-client/src/main/res/drawable-xxhdpi/openmrs_logo.png and b/openmrs-client/src/main/res/drawable-xxhdpi/openmrs_logo.png differ diff --git a/openmrs-client/src/main/res/drawable-xxxhdpi/ic_openmrs.png b/openmrs-client/src/main/res/drawable-xxxhdpi/ic_openmrs.png index bc4e500562..3aebc077ea 100644 Binary files a/openmrs-client/src/main/res/drawable-xxxhdpi/ic_openmrs.png and b/openmrs-client/src/main/res/drawable-xxxhdpi/ic_openmrs.png differ diff --git a/openmrs-client/src/main/res/drawable-xxxhdpi/openmrs_logo.png b/openmrs-client/src/main/res/drawable-xxxhdpi/openmrs_logo.png index 934978e09d..0eda3810ad 100644 Binary files a/openmrs-client/src/main/res/drawable-xxxhdpi/openmrs_logo.png and b/openmrs-client/src/main/res/drawable-xxxhdpi/openmrs_logo.png differ diff --git a/openmrs-client/src/main/res/layout/fragment_login.xml b/openmrs-client/src/main/res/layout/fragment_login.xml index 68b1da9f26..1c8764402b 100644 --- a/openmrs-client/src/main/res/layout/fragment_login.xml +++ b/openmrs-client/src/main/res/layout/fragment_login.xml @@ -135,6 +135,7 @@ - OpenMRS Android Client - OpenMRS + MediHealth + MediHealth Client Settings Logout @@ -79,7 +79,7 @@ Logging out - Are you sure you want to logout from OpenMRS client? + Are you sure you want to logout from MediHealth client? Logout Credentials changed @@ -182,7 +182,7 @@ No active visits in database - OpenMRS android client crashed + MediHealth android client crashed Choose an Email client : No internet connection @@ -256,7 +256,7 @@ Charts View - OpenMRS logo + MediHealth logo Toast with black background Edit form Patient Photo diff --git a/openmrs-client/versions.gradle b/openmrs-client/versions.gradle index de79f03522..22209f8edd 100644 --- a/openmrs-client/versions.gradle +++ b/openmrs-client/versions.gradle @@ -2,7 +2,7 @@ ext.versions = [:] versions.compileSdk = 31 versions.minSdk = 19 -versions.targetSdk = 29 +versions.targetSdk = 34 versions.appVersion = "3.1.1" // Libraries @@ -11,8 +11,8 @@ versions.guava = '29.0-android' versions.supportVersion = '1.0.0' versions.recyclerView = '1.2.0-alpha03' versions.constraintlayout = '1.1.3' -versions.fragment = "1.3.0" -versions.activity = "1.2.0" +versions.fragment = "1.5.1" +versions.activity = "1.5.1" versions.retrofit = '2.3.0' versions.retrofitConverter = '2.1.0' @@ -22,13 +22,13 @@ versions.rxjava = '2.2.6' versions.rxandroid = '2.1.1' versions.rxbinding = '1.0.0' -versions.roomRuntime = '2.3.0-alpha01' -versions.roomPersistence = '1.1.1' -versions.roomCompiler = '2.1.0-alpha04' +versions.roomRuntime = '2.4.3' +versions.roomPersistence = '2.4.3' +versions.roomCompiler = '2.4.3' versions.chuckerLibrary = '3.4.0' -versions.workManager = '2.3.4' +versions.workManager = '2.7.1' versions.seekbar = '1.0.1' versions.MPAndroidChart = 'v3.1.0' @@ -53,7 +53,7 @@ versions.navui = '2.3.0' versions.coreTesting = '1.1.1' -versions.hilt = '2.36' +versions.hilt = '2.44' -versions.lifecycle_version = "2.1.0" +versions.lifecycle_version = "2.5.1" versions.arch_version = "2.1.0"