diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e13d2bd..652e05e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -79,7 +79,6 @@
(R.id.action_update)
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- button.tooltipText = getString(R.string.download_update)
- }
+ val button = findViewById(R.id.action_update)
+ button.text = getString(R.string.download_update)
+ button.icon = getDrawable(R.drawable.baseline_cloud_download_24)
button.isEnabled = true
+ button.visibility = View.VISIBLE
+ button.setOnClickListener({
+ downloadUpdate()
+ })
}
// return
}
diff --git a/app/src/main/kotlin/com/fox2code/mmm/module/ModuleHolder.kt b/app/src/main/kotlin/com/fox2code/mmm/module/ModuleHolder.kt
index 2ec394e..826d4bb 100644
--- a/app/src/main/kotlin/com/fox2code/mmm/module/ModuleHolder.kt
+++ b/app/src/main/kotlin/com/fox2code/mmm/module/ModuleHolder.kt
@@ -242,7 +242,8 @@ class ModuleHolder : Comparable {
if (repoModule != null || localModuleInfo?.updateZipUrl != null && localModuleInfo.updateVersionCode > localModuleInfo.versionCode) {
buttonTypeList.add(ActionButtonType.UPDATE_INSTALL)
}
- if (localModuleInfo != null && localModuleInfo.updateVersionCode <= localModuleInfo.versionCode) {
+ val rInfo = localModuleInfo?.remoteModuleInfo
+ if (localModuleInfo != null && rInfo != null && rInfo.moduleInfo.versionCode <= localModuleInfo.versionCode || localModuleInfo != null && localModuleInfo.updateVersionCode != Long.MIN_VALUE && localModuleInfo.updateVersionCode <= localModuleInfo.versionCode) {
buttonTypeList.add(ActionButtonType.REMOTE)
// set updatezipurl on moduleholder
@@ -255,10 +256,10 @@ class ModuleHolder : Comparable {
updateZipUrl = repoModule!!.zipUrl
}
// last ditch effort, try to get remoteModuleInfo from localModuleInfo
- if (localModuleInfo.remoteModuleInfo != null) {
- Timber.d("remoteModuleInfo: %s", localModuleInfo.remoteModuleInfo!!.zipUrl)
- updateZipUrl = localModuleInfo.remoteModuleInfo!!.zipUrl
- moduleInfo?.updateZipUrl = localModuleInfo.remoteModuleInfo!!.zipUrl
+ if (rInfo != null) {
+ Timber.d("remoteModuleInfo: %s", rInfo.zipUrl)
+ updateZipUrl = rInfo.zipUrl
+ moduleInfo?.updateZipUrl = rInfo.zipUrl
}
}
val config = mainModuleConfig
@@ -441,4 +442,4 @@ class ModuleHolder : Comparable {
}
};
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/activity_update.xml b/app/src/main/res/layout/activity_update.xml
index 2bf0012..c8dfc7e 100644
--- a/app/src/main/res/layout/activity_update.xml
+++ b/app/src/main/res/layout/activity_update.xml
@@ -24,7 +24,7 @@
-
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/menu/update_nav.xml b/app/src/main/res/menu/update_nav.xml
index 670cdba..db46278 100644
--- a/app/src/main/res/menu/update_nav.xml
+++ b/app/src/main/res/menu/update_nav.xml
@@ -11,11 +11,4 @@
android:visible="true"
app:showAsAction="ifRoom" />
-
-
\ No newline at end of file
+