filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Convert further parts to androidx

Browse Source 
CursorLoader, LoaderManager, Preferences, Fragments, ...

Change-Id: I8787b2db365249839547c6d5c21ab7cd5ff42082
This commit is contained in:
Michael W
2024-12-26 14:55:13 +01:00
parent d430161ca0
commit 1914db5ea4
44 changed files with 341 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/datamodel/data/BlockedParticipantsData.java
+5 -2
View File
@@ -17,13 +17,15 @@
package com.android.messaging.datamodel.data;
import android.app.LoaderManager;
import android.content.Context;
import android.content.Loader;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import com.android.messaging.datamodel.BoundCursorLoader;
import com.android.messaging.datamodel.DatabaseHelper.ParticipantColumns;
import com.android.messaging.datamodel.MessagingContentProvider;
@@ -51,6 +53,7 @@ public class BlockedParticipantsData extends BindableData implements
mListener = listener;
}
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
Assert.isTrue(id == BLOCKED_PARTICIPANTS_LOADER);
src/com/android/messaging/datamodel/data/ContactPickerData.java
+7 -3
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +17,14 @@
package com.android.messaging.datamodel.data;
import android.app.LoaderManager;
import android.content.Context;
import android.content.Loader;
import android.database.Cursor;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import com.android.messaging.datamodel.BoundCursorLoader;
import com.android.messaging.datamodel.FrequentContactsCursorBuilder;
import com.android.messaging.datamodel.MessagingContentProvider;
@@ -61,6 +64,7 @@ public class ContactPickerData extends BindableData implements
private static final int FREQUENT_CONTACTS_LOADER = 2;
private static final int PARTICIPANT_LOADER = 3;
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
final String bindingId = args.getString(BINDING_ID);
@@ -91,7 +95,7 @@ public class ContactPickerData extends BindableData implements
* {@inheritDoc}
*/
@Override
public void onLoadFinished(final Loader<Cursor> loader, final Cursor data) {
public void onLoadFinished(@NonNull final Loader<Cursor> loader, final Cursor data) {
final BoundCursorLoader cursorLoader = (BoundCursorLoader) loader;
if (isBound(cursorLoader.getBindingId())) {
switch (loader.getId()) {
src/com/android/messaging/datamodel/data/ConversationData.java
+17 -11
View File
@@ -17,17 +17,19 @@
package com.android.messaging.datamodel.data;
import android.app.LoaderManager;
import android.content.Context;
import android.content.Loader;
import android.database.Cursor;
import android.database.CursorWrapper;
import android.database.sqlite.SQLiteFullException;
import android.net.Uri;
import android.os.Bundle;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import com.android.common.contacts.DataUsageStatUpdater;
import com.android.messaging.Factory;
import com.android.messaging.R;
@@ -180,6 +182,7 @@ public class ConversationData extends BindableData {
* A trampoline class so that we can inherit from LoaderManager.LoaderCallbacks multiple times.
*/
private class MetadataLoaderCallbacks implements LoaderManager.LoaderCallbacks<Cursor> {
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
Assert.equals(CONVERSATION_META_DATA_LOADER, id);
@@ -200,7 +203,7 @@ public class ConversationData extends BindableData {
}
@Override
public void onLoadFinished(final Loader<Cursor> generic, final Cursor data) {
public void onLoadFinished(@NonNull final Loader<Cursor> generic, final Cursor data) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
// Check if data still bound to the requesting ui element
@@ -227,7 +230,7 @@ public class ConversationData extends BindableData {
}
@Override
public void onLoaderReset(final Loader<Cursor> generic) {
public void onLoaderReset(@NonNull final Loader<Cursor> generic) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
// Check if data still bound to the requesting ui element
@@ -246,6 +249,7 @@ public class ConversationData extends BindableData {
* A trampoline class so that we can inherit from LoaderManager.LoaderCallbacks multiple times.
*/
private class MessagesLoaderCallbacks implements LoaderManager.LoaderCallbacks<Cursor> {
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
Assert.equals(CONVERSATION_MESSAGES_LOADER, id);
@@ -268,7 +272,7 @@ public class ConversationData extends BindableData {
}
@Override
public void onLoadFinished(final Loader<Cursor> generic, final Cursor rawData) {
public void onLoadFinished(@NonNull final Loader<Cursor> generic, final Cursor rawData) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
// Check if data still bound to the requesting ui element
@@ -316,7 +320,7 @@ public class ConversationData extends BindableData {
}
@Override
public void onLoaderReset(final Loader<Cursor> generic) {
public void onLoaderReset(@NonNull final Loader<Cursor> generic) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
// Check if data still bound to the requesting ui element
@@ -349,6 +353,7 @@ public class ConversationData extends BindableData {
* A trampoline class so that we can inherit from LoaderManager.LoaderCallbacks multiple times.
*/
private class ParticipantLoaderCallbacks implements LoaderManager.LoaderCallbacks<Cursor> {
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
Assert.equals(PARTICIPANT_LOADER, id);
@@ -369,7 +374,7 @@ public class ConversationData extends BindableData {
}
@Override
public void onLoadFinished(final Loader<Cursor> generic, final Cursor data) {
public void onLoadFinished(@NonNull final Loader<Cursor> generic, final Cursor data) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
// Check if data still bound to the requesting ui element
@@ -383,7 +388,7 @@ public class ConversationData extends BindableData {
}
@Override
public void onLoaderReset(final Loader<Cursor> generic) {
public void onLoaderReset(@NonNull final Loader<Cursor> generic) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
// Check if data still bound to the requesting ui element
@@ -400,6 +405,7 @@ public class ConversationData extends BindableData {
* A trampoline class so that we can inherit from LoaderManager.LoaderCallbacks multiple times.
*/
private class SelfParticipantLoaderCallbacks implements LoaderManager.LoaderCallbacks<Cursor> {
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
Assert.equals(SELF_PARTICIPANT_LOADER, id);
@@ -422,7 +428,7 @@ public class ConversationData extends BindableData {
}
@Override
public void onLoadFinished(final Loader<Cursor> generic, final Cursor data) {
public void onLoadFinished(@NonNull final Loader<Cursor> generic, final Cursor data) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
// Check if data still bound to the requesting ui element
@@ -437,7 +443,7 @@ public class ConversationData extends BindableData {
}
@Override
public void onLoaderReset(final Loader<Cursor> generic) {
public void onLoaderReset(@NonNull final Loader<Cursor> generic) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
// Check if data still bound to the requesting ui element
src/com/android/messaging/datamodel/data/ConversationListData.java
+7 -4
View File
@@ -17,12 +17,14 @@
package com.android.messaging.datamodel.data;
import android.app.LoaderManager;
import android.content.Context;
import android.content.Loader;
import android.database.Cursor;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import com.android.messaging.datamodel.BoundCursorLoader;
import com.android.messaging.datamodel.BugleNotifications;
import com.android.messaging.datamodel.DataModel;
@@ -81,6 +83,7 @@ public class ConversationListData extends BindableData
// all blocked participants
private final HashSet<String> mBlockedParticipants = new HashSet<String>();
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
final String bindingId = args.getString(BINDING_ID);
@@ -116,7 +119,7 @@ public class ConversationListData extends BindableData
* {@inheritDoc}
*/
@Override
public void onLoadFinished(final Loader<Cursor> generic, final Cursor data) {
public void onLoadFinished(@NonNull final Loader<Cursor> generic, final Cursor data) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
if (isBound(loader.getBindingId())) {
switch (loader.getId()) {
@@ -145,7 +148,7 @@ public class ConversationListData extends BindableData
* {@inheritDoc}
*/
@Override
public void onLoaderReset(final Loader<Cursor> generic) {
public void onLoaderReset(@NonNull final Loader<Cursor> generic) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
if (isBound(loader.getBindingId())) {
switch (loader.getId()) {
src/com/android/messaging/datamodel/data/MediaPickerData.java
+8 -4
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,12 +17,14 @@
package com.android.messaging.datamodel.data;
import android.app.LoaderManager;
import android.content.Context;
import android.content.Loader;
import android.database.Cursor;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import com.android.messaging.datamodel.BoundCursorLoader;
import com.android.messaging.datamodel.GalleryBoundCursorLoader;
@@ -57,6 +60,7 @@ public class MediaPickerData extends BindableData {
* A trampoline class so that we can inherit from LoaderManager.LoaderCallbacks multiple times.
*/
private class GalleryLoaderCallbacks implements LoaderManager.LoaderCallbacks<Cursor> {
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
final String bindingId = args.getString(BINDING_ID);
@@ -80,7 +84,7 @@ public class MediaPickerData extends BindableData {
* {@inheritDoc}
*/
@Override
public void onLoadFinished(final Loader<Cursor> loader, final Cursor data) {
public void onLoadFinished(@NonNull final Loader<Cursor> loader, final Cursor data) {
final BoundCursorLoader cursorLoader = (BoundCursorLoader) loader;
if (isBound(cursorLoader.getBindingId())) {
switch (loader.getId()) {
@@ -102,7 +106,7 @@ public class MediaPickerData extends BindableData {
* {@inheritDoc}
*/
@Override
public void onLoaderReset(final Loader<Cursor> loader) {
public void onLoaderReset(@NonNull final Loader<Cursor> loader) {
final BoundCursorLoader cursorLoader = (BoundCursorLoader) loader;
if (isBound(cursorLoader.getBindingId())) {
switch (loader.getId()) {
src/com/android/messaging/datamodel/data/PeopleAndOptionsData.java
+8 -4
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,13 +17,15 @@
package com.android.messaging.datamodel.data;
import android.app.LoaderManager;
import android.content.Context;
import android.content.Loader;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import com.android.messaging.datamodel.BoundCursorLoader;
import com.android.messaging.datamodel.MessagingContentProvider;
import com.android.messaging.datamodel.action.BugleActionToasts;
@@ -63,6 +66,7 @@ public class PeopleAndOptionsData extends BindableData implements
private static final int CONVERSATION_OPTIONS_LOADER = 1;
private static final int PARTICIPANT_LOADER = 2;
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
final String bindingId = args.getString(BINDING_ID);
@@ -98,7 +102,7 @@ public class PeopleAndOptionsData extends BindableData implements
* {@inheritDoc}
*/
@Override
public void onLoadFinished(final Loader<Cursor> loader, final Cursor data) {
public void onLoadFinished(@NonNull final Loader<Cursor> loader, final Cursor data) {
final BoundCursorLoader cursorLoader = (BoundCursorLoader) loader;
if (isBound(cursorLoader.getBindingId())) {
switch (loader.getId()) {
@@ -126,7 +130,7 @@ public class PeopleAndOptionsData extends BindableData implements
* {@inheritDoc}
*/
@Override
public void onLoaderReset(final Loader<Cursor> loader) {
public void onLoaderReset(@NonNull final Loader<Cursor> loader) {
final BoundCursorLoader cursorLoader = (BoundCursorLoader) loader;
if (isBound(cursorLoader.getBindingId())) {
switch (loader.getId()) {
src/com/android/messaging/datamodel/data/SettingsData.java
+7 -3
View File
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* Copyright (C) 2024 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,13 +17,15 @@
package com.android.messaging.datamodel.data;
import android.app.LoaderManager;
import android.content.Context;
import android.content.Loader;
import android.database.Cursor;
import android.os.Bundle;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
import com.android.messaging.R;
import com.android.messaging.datamodel.BoundCursorLoader;
import com.android.messaging.datamodel.DatabaseHelper.ParticipantColumns;
@@ -126,6 +129,7 @@ public class SettingsData extends BindableData implements
private static final int SELF_PARTICIPANT_LOADER = 1;
@NonNull
@Override
public Loader<Cursor> onCreateLoader(final int id, final Bundle args) {
Assert.equals(SELF_PARTICIPANT_LOADER, id);
@@ -147,7 +151,7 @@ public class SettingsData extends BindableData implements
}
@Override
public void onLoadFinished(final Loader<Cursor> generic, final Cursor data) {
public void onLoadFinished(@NonNull final Loader<Cursor> generic, final Cursor data) {
final BoundCursorLoader loader = (BoundCursorLoader) generic;
// Check if data still bound to the requesting ui element