Apps: Drop non-required non-null and safe assertions completely (5c297107) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/MainActivity.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -320,7 +320,7 @@ class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemS

		override fun onSaveInstanceState(outState: Bundle) {
		super.onSaveInstanceState(outState)
		outState?.putInt(CURRENTLY_SELECTED_FRAGMENT_KEY, currentFragmentId)
		outState.putInt(CURRENTLY_SELECTED_FRAGMENT_KEY, currentFragmentId)
		}

		override fun onDestroy() {

app/src/main/java/foundation/e/apps/application/ApplicationActivity.kt

+6 −6

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ class ApplicationActivity :
		initialiseDimensions()
		val applicationPackageName: String? = intent.getStringExtra(APPLICATION_PACKAGE_NAME_KEY)
		if (!applicationPackageName.isNullOrEmpty()) {
		this.applicationPackageName = applicationPackageName!!
		this.applicationPackageName = applicationPackageName
		applicationManagerServiceConnection.bindService(this)
		}

		@@ -236,7 +236,7 @@ class ApplicationActivity :


		// Set the app author
		if (basicData.author!!.isNotEmpty()) {
		if (basicData.author.isNotEmpty()) {
		app_author.text = basicData.author
		} else {
		app_author.visibility = View.GONE
		@@ -272,12 +272,12 @@ class ApplicationActivity :

		// Set the app rating
		val builder = textColorChange(getText(R.string.not_available).toString())
		if (basicData.ratings!!.rating != -1f) {
		if (basicData.ratings.rating != -1f) {
		app_rating.text = basicData.ratings.rating.toString() + "/5"
		} else {
		app_rating.text = builder
		}
		setRatingBorder(basicData.ratings!!.rating)
		setRatingBorder(basicData.ratings.rating)

		app_rating_container.setOnClickListener {
		val text = R.string.ok
		@@ -515,7 +515,7 @@ class ApplicationActivity :

		// Set the app title
		if (pwasBasicData!!.name.isNotEmpty()) {
		app_title.text = pwasBasicData!!.name
		app_title.text = pwasBasicData.name
		} else {
		app_title.visibility = View.GONE
		}
		@@ -529,7 +529,7 @@ class ApplicationActivity :
		app_description_container.isEnabled = false
		}

		if (pwaFullData!!.category.getTitle().isNotEmpty()) {
		if (pwaFullData.category.getTitle().isNotEmpty()) {
		app_category.text = pwaFullData.category.getTitle()
		app_category.setOnClickListener {
		startActivity(Intent(this, CategoryActivity::class.java).apply {

app/src/main/java/foundation/e/apps/application/ApplicationViewHolder.kt

+14 −14

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi
		if (0 != this.accentColorOS) {
		installButton.setBackgroundColor(this.accentColorOS)
		}
		installButton?.setOnClickListener {
		installButton.setOnClickListener {
		if (application?.fullData != null &&
		application!!.fullData!!.getLastVersion() == null) {
		Snackbar.make(view, activity.getString(
		@@ -112,9 +112,9 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi
		application!!.addListener(this)
		title.text = application!!.basicData!!.name
		author.text = application!!.basicData!!.author
		ratingBar.rating = application!!.basicData!!.ratings!!.rating!!
		if (application!!.basicData!!.ratings!!.rating != -1f) {
		rating.text = application!!.basicData!!.ratings!!.rating.toString()
		ratingBar.rating = application!!.basicData!!.ratings.rating!!
		if (application!!.basicData!!.ratings.rating != -1f) {
		rating.text = application!!.basicData!!.ratings.rating.toString()
		} else {
		rating.text = activity.getString(R.string.not_available)
		}
		@@ -154,7 +154,7 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi
		Execute({}, {

		// installButton.setBackgroundResource(R.drawable.app_install_border_simple)
		installButton?.text = activity.getString(state.installButtonTextId)
		installButton.text = activity.getString(state.installButtonTextId)

		when (state) {

		@@ -171,32 +171,32 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi

		State.INSTALLED -> {

		installButton?.isEnabled =
		installButton.isEnabled =
		Common.appHasLaunchActivity(activity, application!!.packageName)
		if (0 != this.accentColorOS) {
		installButton!!.setBackgroundColor(this.accentColorOS)
		installButton.setBackgroundColor(this.accentColorOS)
		} else {
		installButton!!.setBackgroundResource(R.drawable.app_install_border)
		installButton.setBackgroundResource(R.drawable.app_install_border)
		}
		installButton.setTextColor(Color.parseColor("#FAFAFA"))

		}
		State.INSTALLING -> {
		installButton?.isEnabled = false
		installButton.isEnabled = false
		}
		State.NOT_UPDATED -> {
		installButton.setTextColor(Color.parseColor("#FAFAFA"))
		if (0 != this.accentColorOS) {
		installButton!!.setBackgroundColor(this.accentColorOS)
		installButton.setBackgroundColor(this.accentColorOS)
		} else {
		installButton!!.setBackgroundResource(R.drawable.app_install_border)
		installButton.setBackgroundResource(R.drawable.app_install_border)
		}

		installButton?.isEnabled = true
		installButton.isEnabled = true
		}
		else -> {
		installButton.setTextColor(Color.parseColor("#0088ED"))
		installButton?.isEnabled = true
		installButton.isEnabled = true
		}
		}

		@@ -211,7 +211,7 @@ class ApplicationViewHolder(private val activity: Activity, private val view: Vi
		@SuppressLint("SetTextI18n")
		override fun notifyDownloadProgress(count: Int, total: Int) {
		installButton.setGravity(Gravity.CENTER)
		installButton?.text = ((toMiB(count) / toMiB(total)) * 100).toInt().toString() + "%"
		installButton.text = ((toMiB(count) / toMiB(total)) * 100).toInt().toString() + "%"
		installButton.setTextColor(Color.parseColor("#0088ED"))
		installButton.setBackgroundResource(R.drawable.app_installing_border_simple)
		}

app/src/main/java/foundation/e/apps/application/ScreenshotsActivity.kt

+3 −3

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ class ScreenshotsActivity : AppCompatActivity(), ApplicationManagerServiceConnec
		val applicationPackageName: String? =
		intent.getStringExtra(Constants.APPLICATION_PACKAGE_NAME_KEY)
		if (!applicationPackageName.isNullOrEmpty()) {
		this.applicationPackageName = applicationPackageName!!
		this.applicationPackageName = applicationPackageName
		applicationManagerServiceConnection.bindService(this)
		}
		}
		@@ -75,7 +75,7 @@ class ScreenshotsActivity : AppCompatActivity(), ApplicationManagerServiceConnec
		screenshotsCarousel = screenshots_carousel
		screenshotsCarousel.visibility = View.GONE

		pwasBasicData!!.loadImagesAsyncly {
		pwasBasicData.loadImagesAsyncly {
		if (it.isNotEmpty()) {
		screenshotsCarousel.adapter = ScreenshotsCarouselAdapter(this, it)
		screenshotsCarousel.setCurrentItem(lastSelectedScreenshotIndex, false)
		@@ -100,7 +100,7 @@ class ScreenshotsActivity : AppCompatActivity(), ApplicationManagerServiceConnec
		override fun onSaveInstanceState(outState: Bundle) {
		super.onSaveInstanceState(outState)
		if (::screenshotsCarousel.isInitialized) {
		outState?.putInt(last_selected_screenshot_key, screenshotsCarousel.currentItem)
		outState.putInt(last_selected_screenshot_key, screenshotsCarousel.currentItem)
		}
		}

app/src/main/java/foundation/e/apps/application/model/Application.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -290,7 +290,7 @@ class Application(val packageName: String, private val applicationManager: Appli
		private fun findBasicData(context: Context): Error? {
		var error: Error? = null
		if (Common.isNetworkAvailable(context)) {
		PackageNameSearchRequest(packageName!!).request { applicationError, searchResult ->
		PackageNameSearchRequest(packageName).request { applicationError, searchResult ->
		when (applicationError) {
		null -> {
		error = Error.NO_RESULTS