fixed NPE

This commit is contained in:
Mariotaku Lee 2016-10-16 13:23:39 +08:00
parent 1308852e9e
commit e18c6f21bf
3 changed files with 60 additions and 65 deletions

View File

@ -1,61 +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.loader;
import android.content.Context;
import android.support.v4.content.AsyncTaskLoader;
import android.util.Log;
import org.mariotaku.microblog.library.MicroBlog;
import org.mariotaku.microblog.library.MicroBlogException;
import org.mariotaku.microblog.library.twitter.model.ResponseList;
import org.mariotaku.microblog.library.twitter.model.SavedSearch;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.util.MicroBlogAPIFactory;
public class SavedSearchesLoader extends AsyncTaskLoader<ResponseList<SavedSearch>> implements Constants {
private final UserKey mAccountId;
public SavedSearchesLoader(final Context context, final UserKey accountKey) {
super(context);
mAccountId = accountKey;
}
@Override
public ResponseList<SavedSearch> loadInBackground() {
final MicroBlog twitter = MicroBlogAPIFactory.getInstance(getContext(), mAccountId,
false);
if (twitter == null) return null;
try {
return twitter.getSavedSearches();
} catch (final MicroBlogException e) {
Log.w(LOGTAG, e);
}
return null;
}
@Override
public void onStartLoading() {
forceLoad();
}
}

View File

@ -37,7 +37,9 @@ import org.mariotaku.twidere.model.message.SavedSearchDestroyedEvent
import org.mariotaku.twidere.util.IntentUtils.openTweetSearch
import java.util.*
class SavedSearchesListFragment : AbsContentListViewFragment<SavedSearchesAdapter>(), LoaderCallbacks<ResponseList<SavedSearch>>, AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener {
class SavedSearchesListFragment : AbsContentListViewFragment<SavedSearchesAdapter>(),
LoaderCallbacks<ResponseList<SavedSearch>?>, AdapterView.OnItemClickListener,
AdapterView.OnItemLongClickListener {
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
@ -61,7 +63,7 @@ class SavedSearchesListFragment : AbsContentListViewFragment<SavedSearchesAdapte
return SavedSearchesAdapter(activity)
}
override fun onCreateLoader(id: Int, args: Bundle): Loader<ResponseList<SavedSearch>> {
override fun onCreateLoader(id: Int, args: Bundle?): Loader<ResponseList<SavedSearch>?> {
return SavedSearchesLoader(activity, accountKey)
}
@ -79,11 +81,11 @@ class SavedSearchesListFragment : AbsContentListViewFragment<SavedSearchesAdapte
openTweetSearch(activity, accountKey, item.query)
}
override fun onLoaderReset(loader: Loader<ResponseList<SavedSearch>>) {
override fun onLoaderReset(loader: Loader<ResponseList<SavedSearch>?>) {
adapter!!.setData(null)
}
override fun onLoadFinished(loader: Loader<ResponseList<SavedSearch>>, data: ResponseList<SavedSearch>?) {
override fun onLoadFinished(loader: Loader<ResponseList<SavedSearch>?>, data: ResponseList<SavedSearch>?) {
if (data != null) {
Collections.sort(data, POSITION_COMPARATOR)
}

View File

@ -0,0 +1,54 @@
/*
* 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.loader
import android.content.Context
import android.support.v4.content.AsyncTaskLoader
import android.util.Log
import org.mariotaku.microblog.library.MicroBlogException
import org.mariotaku.microblog.library.twitter.model.ResponseList
import org.mariotaku.microblog.library.twitter.model.SavedSearch
import org.mariotaku.twidere.Constants
import org.mariotaku.twidere.TwidereConstants.LOGTAG
import org.mariotaku.twidere.model.UserKey
import org.mariotaku.twidere.util.MicroBlogAPIFactory
class SavedSearchesLoader(
context: Context,
private val accountId: UserKey
) : AsyncTaskLoader<ResponseList<SavedSearch>>(context), Constants {
override fun loadInBackground(): ResponseList<SavedSearch>? {
val twitter = MicroBlogAPIFactory.getInstance(context, accountId,
false) ?: return null
try {
return twitter.savedSearches
} catch (e: MicroBlogException) {
Log.w(LOGTAG, e)
}
return null
}
public override fun onStartLoading() {
forceLoad()
}
}