Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-02 01:36:50 +01:00
Code Issues Releases Wiki Activity

Fix some deprecations

Browse Source
This commit is contained in:
TacoTheDank 2020-06-26 23:29:14 -04:00
parent c0a72762d2
commit 9357456e6a
9 changed files with 14 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
twidere/src/main/java/org/mariotaku/twidere/fragment/FileSelectorDialogFragment.java
View File

@ -1,18 +1,18 @@
/*
* Twidere - Twitter client for Android
*
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@ -30,6 +30,7 @@ import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import androidx.loader.app.LoaderManager;
import androidx.loader.app.LoaderManager.LoaderCallbacks;
import androidx.loader.content.FixedAsyncTaskLoader;
import androidx.loader.content.Loader;
@ -73,7 +74,7 @@ public class FileSelectorDialogFragment extends BaseDialogFragment implements Lo
public void onActivityCreated(final Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
final Bundle args = getArguments();
getLoaderManager().initLoader(0, args, this);
LoaderManager.getInstance(this).initLoader(0, args, this);
}
@Override
@ -155,7 +156,7 @@ public class FileSelectorDialogFragment extends BaseDialogFragment implements Lo
if (file.isDirectory()) {
final Bundle args = getArguments();
args.putString(EXTRA_PATH, file.getAbsolutePath());
getLoaderManager().restartLoader(0, args, this);
LoaderManager.getInstance(this).restartLoader(0, args, this);
} else if (file.isFile() && !isPickDirectory()) {
final FragmentActivity a = getActivity();
if (a instanceof Callback) {

2
twidere/src/main/java/org/mariotaku/twidere/fragment/KeyboardShortcutsFragment.java
View File

@ -67,7 +67,7 @@ public class KeyboardShortcutsFragment extends BasePreferenceFragment implements
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.reset) {
final DialogFragment f = new ResetKeyboardShortcutConfirmDialogFragment();
f.show(getFragmentManager(), "reset_keyboard_shortcut_confirm");
f.show(getParentFragmentManager(), "reset_keyboard_shortcut_confirm");
return true;
}
return super.onOptionsItemSelected(item);

2
twidere/src/main/java/org/mariotaku/twidere/preference/MultiSelectListPreference.java
View File

@ -56,7 +56,7 @@ abstract class MultiSelectListPreference extends DialogPreference implements IDi
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
final MultiSelectListDialogFragment df = MultiSelectListDialogFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
protected abstract boolean[] getDefaults();

2
twidere/src/main/java/org/mariotaku/twidere/preference/NotificationTypePreference.java
View File

@ -98,7 +98,7 @@ public class NotificationTypePreference extends DialogPreference implements
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
final NotificationTypeDialogFragment df = NotificationTypeDialogFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
public int getDefaultValue() {

2
twidere/src/main/java/org/mariotaku/twidere/preference/SeekBarDialogPreference.java
View File

@ -188,7 +188,7 @@ public class SeekBarDialogPreference extends DialogPreference implements IDialog
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
SeekBarDialogPreferenceFragment df = SeekBarDialogPreferenceFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
public static class SeekBarDialogPreferenceFragment extends ThemedPreferenceDialogFragmentCompat {

2
twidere/src/main/java/org/mariotaku/twidere/preference/SettingsImportExportPreference.java
View File

@ -52,7 +52,7 @@ public class SettingsImportExportPreference extends DialogPreference implements
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
ImportExportDialogFragment df = ImportExportDialogFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
public static class ImportExportDialogFragment extends PreferenceDialogFragmentCompat {

2
twidere/src/main/java/org/mariotaku/twidere/preference/ThemeBackgroundPreference.java
View File

@ -98,7 +98,7 @@ public class ThemeBackgroundPreference extends DialogPreference implements Const
public void displayDialog(@NonNull PreferenceFragmentCompat fragment) {
InternalDialogFragment df = InternalDialogFragment.newInstance(getKey());
df.setTargetFragment(fragment, 0);
df.show(fragment.getFragmentManager(), getKey());
df.show(fragment.getParentFragmentManager(), getKey());
}
private void saveValue() {

63
twidere/src/main/java/org/mariotaku/twidere/util/content/SupportFragmentReloadCursorObserver.java
View File

@ -1,63 +0,0 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2014 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.util.content;
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.loader.app.LoaderManager.LoaderCallbacks;
import org.mariotaku.twidere.TwidereConstants;
public class SupportFragmentReloadCursorObserver extends ContentObserver implements TwidereConstants {
private final Fragment mFragment;
private final int mLoaderId;
private final LoaderCallbacks<Cursor> mCallback;
public SupportFragmentReloadCursorObserver(final Fragment fragment, final int loaderId,
final LoaderCallbacks<Cursor> callback) {
super(createHandler());
mFragment = fragment;
mLoaderId = loaderId;
mCallback = callback;
}
private static Handler createHandler() {
if (Thread.currentThread().getId() != 1) return new Handler(Looper.getMainLooper());
return new Handler();
}
@Override
public final void onChange(final boolean selfChange) {
onChange(selfChange, null);
}
@Override
public void onChange(final boolean selfChange, @Nullable final Uri uri) {
if (mFragment == null || mFragment.getActivity() == null || mFragment.isDetached()) return;
// Handle change.
mFragment.getLoaderManager().restartLoader(mLoaderId, null, mCallback);
}
}

2
twidere/src/main/java/org/mariotaku/twidere/util/support/ActivitySupport.java
View File

@ -45,7 +45,7 @@ public class ActivitySupport {
}
private static TaskDescription toNativeTaskDescription(TaskDescriptionCompat taskDescription) {
return new TaskDescription(taskDescription.getLabel(), taskDescription.getIcon(), taskDescription.getPrimaryColor());
return new TaskDescription(taskDescription.getLabel(), taskDescription.getPrimaryColor());
}
}