Update API address and minor updates

celestiamobile · Oct 17, 2020 · e65d5ef · e65d5ef
1 parent e934dd5
commit e65d5ef
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt b/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt
@@ -236,7 +236,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main),
 
     override fun onDestroy() {
         AppStatusReporter.shared().unregister(this)
-        compositeDisposable.dispose()
+        compositeDisposable.clear()
 
         super.onDestroy()
     }

diff --git a/app/src/main/java/space/celestia/mobilecelestia/search/SearchFragment.kt b/app/src/main/java/space/celestia/mobilecelestia/search/SearchFragment.kt
@@ -113,7 +113,7 @@ class SearchFragment : Fragment() {
     }
 
     override fun onDestroy() {
-        compositeDisposable.dispose()
+        compositeDisposable.clear()
 
         super.onDestroy()
     }

diff --git a/app/src/main/java/space/celestia/mobilecelestia/share/ShareAPI.kt b/app/src/main/java/space/celestia/mobilecelestia/share/ShareAPI.kt
@@ -45,7 +45,7 @@ class ResultMap<T>(private val cls: Class<T>?) : Function<BaseResult, T?> {
 
 object ShareAPI {
     val shared: Retrofit = Retrofit.Builder()
-        .baseUrl("https://astroweather.cn/celestia/")
+        .baseUrl("https://celestia.mobi/api/")
         .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
         .addConverterFactory(GsonConverterFactory.create())
         .build()

diff --git a/app/src/main/java/space/celestia/mobilecelestia/toolbar/ToolbarFragment.kt b/app/src/main/java/space/celestia/mobilecelestia/toolbar/ToolbarFragment.kt
@@ -40,7 +40,6 @@ enum class ToolbarAction : Serializable {
                 Setting -> "Settings"
                 Home -> "Home (Sol)"
                 Event -> "Eclipse Finder"
-                Exit -> "Exit"
                 else -> this.toString()
             }
             return CelestiaString(orig, "")

diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -14,4 +14,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip