Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5970d09
Refactor: Extract on result action functions for jetpack remote install
ParaskP7 Sep 29, 2022
103b90c
Analysis: Suppress on/start activity (for) result deprecated warnings
ParaskP7 Sep 29, 2022
542ace1
Analysis: Resolve from html deprecated warnings
ParaskP7 Sep 29, 2022
7ddf2f6
Analysis: Suppress set/get target fragment deprecated warnings
ParaskP7 Sep 29, 2022
6e32c33
Analysis: Suppress on activity created deprecated warnings
ParaskP7 Sep 29, 2022
623cf29
Analysis: Suppress fragment pager adapter deprecated warnings
ParaskP7 Sep 29, 2022
a1de9eb
Analysis: Suppress progress dialog deprecated warnings
ParaskP7 Sep 30, 2022
28bcef7
Analysis: Suppress comments detail activity deprecated warnings
ParaskP7 Oct 3, 2022
11e6f27
Analysis: Resolve on navigation (re) selected deprecated warnings
ParaskP7 Oct 3, 2022
567e63e
Analysis: Suppress exo player utils deprecated warnings
ParaskP7 Oct 3, 2022
4a037be
Analysis: Suppress request permissions deprecated warnings
ParaskP7 Oct 3, 2022
f1e9bcd
Analysis: Suppress get external storage public dir deprecated warnings
ParaskP7 Oct 3, 2022
7159db4
Analysis: Suppress photo picker activity deprecated warnings
ParaskP7 Oct 3, 2022
954bfae
Analysis: Suppress async task deprecated warnings
ParaskP7 Oct 3, 2022
538e46c
Analysis: Suppress glide deprecated warnings
ParaskP7 Oct 3, 2022
897977a
Analysis: Replace java with kotlin suppresion for deprication
ParaskP7 Oct 3, 2022
8c76d9e
Analysis: Suppress allow scanning by media scanner deprecated warning
ParaskP7 Oct 3, 2022
a5b8e33
Analysis: Suppress window manager display/insets deprecated warnings
ParaskP7 Oct 3, 2022
75db65b
Analysis: Suppress fragment manager deprecated warnings
ParaskP7 Oct 3, 2022
7ee8cb3
Analysis: Resolve handler deprecated warnings
ParaskP7 Oct 3, 2022
bff920f
Analysis: Suppress set bound in parent deprecated warnings
ParaskP7 Oct 3, 2022
3751b8f
Analysis: Suppress signature deprecated warnings
ParaskP7 Oct 3, 2022
a3be18f
Analysis: Resolve lifecycle registry mark state deprecated warning
ParaskP7 Oct 3, 2022
2f57fdc
Analysis: Resolve nested web view get action masked deprecated warning
ParaskP7 Oct 3, 2022
7811dd1
Analysis: Resolve detekt warnings by manually updating the baseline
ParaskP7 Oct 3, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ class LoginPrologueFragment : Fragment(R.layout.jetpack_login_prologue_screen) {
viewModel.onFragmentResume()
}

@Suppress("DEPRECATION")
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
// important for accessibility - talkback
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.wordpress.android.models;

import android.content.Context;
import android.text.Html;
import android.text.Spanned;
import android.text.TextUtils;

import androidx.annotation.NonNull;
import androidx.core.text.HtmlCompat;

import org.json.JSONArray;
import org.json.JSONObject;
Expand Down Expand Up @@ -183,7 +183,7 @@ public Spanned getAttributionHtml() {
html = "";
}

mAttributionHtml = Html.fromHtml(html);
mAttributionHtml = HtmlCompat.fromHtml(html, HtmlCompat.FROM_HTML_MODE_LEGACY);
}
return mAttributionHtml;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
Expand All @@ -18,6 +17,7 @@

import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.Toolbar;
import androidx.core.text.HtmlCompat;

import org.wordpress.android.R;
import org.wordpress.android.util.AppLog;
Expand Down Expand Up @@ -96,7 +96,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
holder.mTxtLineNumber.setVisibility(View.GONE);
}

holder.mTxtLogEntry.setText(Html.fromHtml(mEntries.get(position)));
holder.mTxtLogEntry.setText(HtmlCompat.fromHtml(mEntries.get(position), HtmlCompat.FROM_HTML_MODE_LEGACY));

return convertView;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ import android.os.Bundle
import android.view.View
import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProvider
import org.wordpress.android.R
import org.wordpress.android.WordPress
import org.wordpress.android.databinding.JetpackRemoteInstallFragmentBinding
import org.wordpress.android.fluxc.model.SiteModel
import org.wordpress.android.login.LoginMode
import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData
import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData.Action.CONNECT
import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData.Action.LOGIN
import org.wordpress.android.ui.JetpackRemoteInstallViewModel.JetpackResultActionData.Action.MANUAL_INSTALL
Expand Down Expand Up @@ -54,36 +56,54 @@ class JetpackRemoteInstallFragment : Fragment(R.layout.jetpack_remote_install_fr
viewModel.liveActionOnResult.observe(viewLifecycleOwner, Observer { result ->
if (result != null) {
when (result.action) {
MANUAL_INSTALL -> {
JetpackConnectionWebViewActivity.startManualFlow(
activity,
source,
result.site,
result.loggedIn
)
activity.finish()
}
LOGIN -> {
val loginIntent = Intent(activity, LoginActivity::class.java)
LoginMode.JETPACK_STATS.putInto(loginIntent)
loginIntent.putExtra(LoginActivity.ARG_JETPACK_CONNECT_SOURCE, source)
startActivityForResult(loginIntent, JETPACK_LOGIN)
}
CONNECT -> {
JetpackConnectionWebViewActivity.startJetpackConnectionFlow(
activity,
source,
result.site,
result.loggedIn
)
activity.finish()
}
MANUAL_INSTALL -> onManualInstallResultAction(activity, source, result)
LOGIN -> onLoginResultAction(activity, source)
CONNECT -> onConnectResultAction(activity, source, result)
}
}
})
}
}

private fun onManualInstallResultAction(
activity: FragmentActivity,
source: JetpackConnectionSource,
result: JetpackResultActionData
) {
JetpackConnectionWebViewActivity.startManualFlow(
activity,
source,
result.site,
result.loggedIn
)
activity.finish()
}

@Suppress("DEPRECATION")
private fun onLoginResultAction(
activity: FragmentActivity,
source: JetpackConnectionSource
) {
val loginIntent = Intent(activity, LoginActivity::class.java)
LoginMode.JETPACK_STATS.putInto(loginIntent)
loginIntent.putExtra(LoginActivity.ARG_JETPACK_CONNECT_SOURCE, source)
startActivityForResult(loginIntent, JETPACK_LOGIN)
}

private fun onConnectResultAction(
activity: FragmentActivity,
source: JetpackConnectionSource,
result: JetpackResultActionData
) {
JetpackConnectionWebViewActivity.startJetpackConnectionFlow(
activity,
source,
result.site,
result.loggedIn
)
activity.finish()
}

private fun JetpackRemoteInstallFragmentBinding.initLiveViewStateObserver() {
viewModel.liveViewState.observe(viewLifecycleOwner, Observer { viewState ->
if (viewState != null) {
Expand Down Expand Up @@ -111,6 +131,7 @@ class JetpackRemoteInstallFragment : Fragment(R.layout.jetpack_remote_install_fr
})
}

@Suppress("DEPRECATION")
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
if (requestCode == JETPACK_LOGIN && resultCode == Activity.RESULT_OK) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("DEPRECATION")

package org.wordpress.android.ui

import android.app.Dialog
Expand All @@ -10,6 +12,7 @@ import androidx.fragment.app.FragmentManager
import org.wordpress.android.R

class PrivateAtCookieRefreshProgressDialog : DialogFragment() {
@Suppress("DEPRECATION")
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val dialogMessage = activity?.getString(R.string.media_accessing_progress)
return ProgressDialog.show(
Expand All @@ -25,6 +28,7 @@ class PrivateAtCookieRefreshProgressDialog : DialogFragment() {
return dialog != null && dialog!!.isShowing
}

@Suppress("DEPRECATION")
override fun onCancel(dialog: DialogInterface) {
super.onCancel(dialog)
if (targetFragment is PrivateAtCookieProgressDialogOnDismissListener) {
Expand All @@ -41,6 +45,7 @@ class PrivateAtCookieRefreshProgressDialog : DialogFragment() {
showIfNecessary(fragmentManager, null)
}

@Suppress("DEPRECATION")
fun showIfNecessary(fragmentManager: FragmentManager?, targetFragment: Fragment?) {
fragmentManager?.let {
val thisFragment = fragmentManager.findFragmentByTag(TAG)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ public void onAttach(Context context) {
}
}

@Override public void onActivityCreated(@Nullable Bundle savedInstanceState) {
@Override
@SuppressWarnings("deprecation")
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
// important for accessibility - talkback
getActivity().setTitle(R.string.share_intent_screen_title);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public static TextInputDialogFragment newInstance(String title,
}

@Override
@SuppressWarnings("deprecation")
public Dialog onCreateDialog(Bundle savedInstanceState) {
LayoutInflater layoutInflater = LayoutInflater.from(getActivity());
//noinspection InflateParams
Expand Down Expand Up @@ -112,7 +113,9 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
return alertDialog;
}

@Override public void onDismiss(@NonNull DialogInterface dialog) {
@Override
@SuppressWarnings("deprecation")
public void onDismiss(@NonNull DialogInterface dialog) {
super.onDismiss(dialog);
if (getTargetFragment() instanceof Callback) {
((Callback) getTargetFragment()).onTextInputDialogDismissed(callbackId);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.wordpress.android.ui.accounts.login

import android.os.Bundle
import android.text.Html
import android.view.LayoutInflater
import android.view.View
import android.widget.EditText
import android.widget.TextView
import androidx.annotation.LayoutRes
import androidx.annotation.StringRes
import androidx.core.text.HtmlCompat
import androidx.fragment.app.Fragment
import org.wordpress.android.R
import org.wordpress.android.databinding.LoginIntroTemplateViewBinding
Expand Down Expand Up @@ -83,12 +83,18 @@ class LoginProloguePageFragment : Fragment(R.layout.login_intro_template_view) {

// format text from HTML to show bold on third prologue screen
if (promoLayoutId == R.layout.login_prologue_third) {
view.findViewById<TextView>(R.id.text_one).text = Html.fromHtml(getString(
R.string.login_prologue_third_subtitle_one))
view.findViewById<TextView>(R.id.text_two).text = Html.fromHtml(getString(
R.string.login_prologue_third_subtitle_two))
view.findViewById<TextView>(R.id.text_three).text = Html.fromHtml(getString(
R.string.login_prologue_third_subtitle_three))
view.findViewById<TextView>(R.id.text_one).text = HtmlCompat.fromHtml(
getString(R.string.login_prologue_third_subtitle_one),
HtmlCompat.FROM_HTML_MODE_LEGACY
)
view.findViewById<TextView>(R.id.text_two).text = HtmlCompat.fromHtml(
getString(R.string.login_prologue_third_subtitle_two),
HtmlCompat.FROM_HTML_MODE_LEGACY
)
view.findViewById<TextView>(R.id.text_three).text = HtmlCompat.fromHtml(
getString(R.string.login_prologue_third_subtitle_three),
HtmlCompat.FROM_HTML_MODE_LEGACY
)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.text.Editable;
import android.text.Html;
import android.text.Spanned;
import android.text.SpannedString;
import android.text.TextUtils;
Expand All @@ -17,6 +16,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.core.text.HtmlCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.SimpleItemAnimator;
Expand Down Expand Up @@ -381,9 +381,7 @@ public void onUsernameSuggestionsFetched(OnUsernameSuggestionsFetched event) {
mUsernameSuggestionInput,
"</b>"
);
mUsernameView.setError(Html.fromHtml(
error
));
mUsernameView.setError(HtmlCompat.fromHtml(error, HtmlCompat.FROM_HTML_MODE_LEGACY));
} else {
populateUsernameSuggestions(event.suggestions);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("DEPRECATION")

package org.wordpress.android.ui.accounts.signup

import android.app.ProgressDialog
Expand Down Expand Up @@ -33,7 +35,7 @@ import org.wordpress.android.widgets.WPDialogSnackbar
*/
class SettingsUsernameChangerFragment : BaseUsernameChangerFullScreenDialogFragment() {
private lateinit var dialogController: FullScreenDialogController
private var progressDialog: ProgressDialog? = null
@Suppress("DEPRECATION") private var progressDialog: ProgressDialog? = null

override fun getSuggestionsFailedStat() = ACCOUNT_SETTINGS_CHANGE_USERNAME_SUGGESTIONS_FAILED
override fun canHeaderTextLiveUpdate() = false
Expand Down Expand Up @@ -154,6 +156,7 @@ class SettingsUsernameChangerFragment : BaseUsernameChangerFullScreenDialogFragm
}
}

@Suppress("DEPRECATION")
fun showProgress() {
if (progressDialog == null || progressDialog?.window == null || progressDialog?.isShowing == false) {
progressDialog = ProgressDialog(context).apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
import org.wordpress.android.ui.photopicker.MediaPickerConstants;
import org.wordpress.android.ui.photopicker.MediaPickerLauncher;
import org.wordpress.android.ui.photopicker.PhotoPickerActivity;
import org.wordpress.android.ui.photopicker.PhotoPickerActivity.PhotoPickerMediaSource;
import org.wordpress.android.ui.prefs.AppPrefsWrapper;
import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic;
import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
Expand Down Expand Up @@ -365,6 +364,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
}

@Override
@SuppressWarnings("deprecation")
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);

Expand All @@ -378,8 +378,10 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
data.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_URIS);

if (mediaUriStringsArray != null && mediaUriStringsArray.length > 0) {
PhotoPickerMediaSource source = PhotoPickerMediaSource.fromString(
data.getStringExtra(MediaPickerConstants.EXTRA_MEDIA_SOURCE));
PhotoPickerActivity.PhotoPickerMediaSource source =
PhotoPickerActivity.PhotoPickerMediaSource.fromString(
data.getStringExtra(MediaPickerConstants.EXTRA_MEDIA_SOURCE)
);
AnalyticsTracker.Stat stat =
source == PhotoPickerActivity.PhotoPickerMediaSource.ANDROID_CAMERA
? SIGNUP_EMAIL_EPILOGUE_GRAVATAR_SHOT_NEW
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.wordpress.android.ui.accounts.signup

import android.os.Bundle
import android.text.Html
import android.text.Spanned
import androidx.core.text.HtmlCompat
import org.wordpress.android.R
import org.wordpress.android.analytics.AnalyticsTracker.Stat.SIGNUP_SOCIAL_EPILOGUE_USERNAME_SUGGESTIONS_FAILED
import org.wordpress.android.ui.FullScreenDialogFragment.FullScreenDialogController
Expand All @@ -13,7 +13,7 @@ import org.wordpress.android.ui.FullScreenDialogFragment.FullScreenDialogControl
class UsernameChangerFullScreenDialogFragment : BaseUsernameChangerFullScreenDialogFragment() {
override fun getSuggestionsFailedStat() = SIGNUP_SOCIAL_EPILOGUE_USERNAME_SUGGESTIONS_FAILED
override fun canHeaderTextLiveUpdate() = true
override fun getHeaderText(username: String?, display: String?): Spanned = Html.fromHtml(
override fun getHeaderText(username: String?, display: String?): Spanned = HtmlCompat.fromHtml(
String.format(
getString(R.string.username_changer_header),
"<b>",
Expand All @@ -22,7 +22,8 @@ class UsernameChangerFullScreenDialogFragment : BaseUsernameChangerFullScreenDia
"<b>",
display,
"</b>"
)
),
HtmlCompat.FROM_HTML_MODE_LEGACY
)

override fun getTrackEventSource() = SOURCE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class ActivityLogDetailActivity : LocaleAwareActivity() {
return super.onOptionsItemSelected(item)
}

@Suppress("DEPRECATION")
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
when (requestCode) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class ActivityLogListActivity : LocaleAwareActivity(), ScrollableViewInitialized
return super.onOptionsItemSelected(item)
}

@Suppress("DEPRECATION")
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
when (requestCode) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ class ActivityLogListFragment : Fragment(R.layout.activity_log_list_fragment) {
}
}

@Suppress("DEPRECATION")
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
with(requireActivity()) {
Expand Down
Loading