Compare commits

..

No commits in common. "3a55583460d3294efc7ae2000616d1cb4ec6ad68" and "714e5f8a4bdf49ceea0d5dbc3e32749273c274b1" have entirely different histories.

7 changed files with 8 additions and 15 deletions

View file

@ -324,7 +324,7 @@ after opening the app.
)
.subscribeOn(Schedulers.io())
.blockingGet()
Timber.d("Resuming %d uploads...", stuckUploads.size)
Timber.d("Resuming " + stuckUploads.size + " uploads...")
if (!stuckUploads.isEmpty()) {
for (contribution in stuckUploads) {
contribution.state = Contribution.STATE_QUEUED

View file

@ -9,6 +9,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ProgressBar
import android.widget.Switch
import androidx.appcompat.app.AlertDialog
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.view.isVisible
@ -19,7 +20,6 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.switchmaterial.SwitchMaterial
import fr.free.nrw.commons.contributions.Contribution
import fr.free.nrw.commons.contributions.ContributionDao
import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao
@ -82,7 +82,7 @@ class ImageFragment :
*/
private var selectorRV: RecyclerView? = null
private var loader: ProgressBar? = null
private var switch: SwitchMaterial? = null
private var switch: Switch? = null
lateinit var filteredImages: ArrayList<Image>
/**

View file

@ -112,8 +112,8 @@ class WikidataItemDetailsActivity : BaseActivity(), MediaDetailProvider, Categor
viewPagerAdapter!!.setTabs(
R.string.title_for_media to depictionImagesListFragment!!,
R.string.title_for_child_classes to childDepictionsFragment,
R.string.title_for_parent_classes to parentDepictionsFragment
R.string.title_for_subcategories to childDepictionsFragment,
R.string.title_for_parent_categories to parentDepictionsFragment
)
binding!!.viewPager.offscreenPageLimit = 2
viewPagerAdapter!!.notifyDataSetChanged()

View file

@ -27,7 +27,6 @@ import java.io.File
import java.io.FileOutputStream
import java.util.Locale
import javax.inject.Inject
import timber.log.Timber
/**
* This activity will set two tabs, achievements and
@ -123,7 +122,7 @@ class ProfileActivity : BaseActivity() {
val rootView = window.decorView.findViewById<View>(android.R.id.content)
val screenShot = getScreenShot(rootView)
if (screenShot == null) {
Timber.e("ScreenShot is null")
Log.e("ERROR", "ScreenShot is null")
return false
}
showAlert(screenShot)

View file

@ -1,7 +1,6 @@
package fr.free.nrw.commons.settings
import android.Manifest.permission
import android.annotation.SuppressLint
import android.app.Activity
import android.app.Dialog
import android.content.Context.MODE_PRIVATE
@ -304,11 +303,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
)
}
// Remove the space for icons in the settings menu.
// This uses an internal API that shouldn't be used in app code,
// but it appears to be the most robust way to do this at the moment,
// disable the warning.
@SuppressLint("RestrictedApi")
override fun onCreateAdapter(preferenceScreen: PreferenceScreen): Adapter<PreferenceViewHolder>
{
return object : PreferenceGroupAdapter(preferenceScreen) {

View file

@ -37,7 +37,7 @@ object LocationUtils {
latLng = LatLng(latLngArray[1].trim().toDouble(),
latLngArray[0].trim().toDouble(), 1f)
} catch (e: Exception) {
Timber.e(e, "Error while parsing user entered lat long")
Timber.e("Error while parsing user entered lat long: %s", e)
}
return latLng

View file

@ -6,7 +6,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/mainBackground">
<com.google.android.material.switchmaterial.SwitchMaterial
<Switch
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"