Mastodon
/
Shitter-android-app
mirror of https://github.com/nuclearfog/Shitter.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix

This commit is contained in:
NudeDude 2019-01-19 14:09:36 +01:00
parent d5b632ecd7
commit 4ecf8eb111
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/nuclearfog/twidda/MainActivity.java
View File

@ -256,8 +256,8 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener
case R.id.action_settings: case R.id.action_settings:
if (home != null && home.getStatus() == RUNNING) { if (home != null && home.getStatus() == RUNNING) {
home.cancel(true); home.cancel(true);
home = null;
} }
home = null;
Intent settings = new Intent(this, AppSettings.class); Intent settings = new Intent(this, AppSettings.class);
startActivityForResult(settings, SETTING); startActivityForResult(settings, SETTING);
break; break;

21
app/src/main/java/org/nuclearfog/twidda/backend/TwitterSearch.java
View File

@ -18,7 +18,7 @@ import java.util.List;
import twitter4j.TwitterException; import twitter4j.TwitterException;
public class TwitterSearch extends AsyncTask<String, Integer, Boolean> { public class TwitterSearch extends AsyncTask<String, Integer, Void> {
private final int TWEET = 0; private final int TWEET = 0;
private final int USER = 1; private final int USER = 1;
@ -46,7 +46,7 @@ public class TwitterSearch extends AsyncTask<String, Integer, Boolean> {
@Override @Override
protected Boolean doInBackground(String... search) { protected Void doInBackground(String... search) {
String strSearch = search[0]; String strSearch = search[0];
long id = 1L; long id = 1L;
try { try {
@ -61,12 +61,10 @@ public class TwitterSearch extends AsyncTask<String, Integer, Boolean> {
} }
} catch (TwitterException err) { } catch (TwitterException err) {
this.err = err; this.err = err;
return false;
} catch (Exception err) { } catch (Exception err) {
Log.e("Twitter Search", err.getMessage()); Log.e("Twitter Search", err.getMessage());
return false;
} }
return true; return null;
} }
@ -91,15 +89,14 @@ public class TwitterSearch extends AsyncTask<String, Integer, Boolean> {
@Override @Override
protected void onPostExecute(Boolean success) { protected void onPostExecute(Void v) {
if (ui.get() == null) return; if (ui.get() == null) return;
if (!success) { SwipeRefreshLayout tweetReload = ui.get().findViewById(R.id.searchtweets);
SwipeRefreshLayout tweetReload = ui.get().findViewById(R.id.searchtweets); tweetReload.setRefreshing(false);
tweetReload.setRefreshing(false);
if (err != null) { if (err != null) {
ErrorHandling.printError(ui.get(), err); ErrorHandling.printError(ui.get(), err);
}
} }
} }