diff --git a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java index 0e8a3bdce..42ec4a8b1 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseMainActivity.java @@ -1251,7 +1251,9 @@ public abstract class BaseMainActivity extends BaseActivity // Retrieves instance new RetrieveInstanceAsyncTask(getApplicationContext(), BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); // Retrieves filters - new ManageFiltersAsyncTask(getApplicationContext(), GET_ALL_FILTER, null, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + if( social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { + new ManageFiltersAsyncTask(getApplicationContext(), GET_ALL_FILTER, null, BaseMainActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + } } /* Clean cache for statuses */ diff --git a/app/src/main/java/app/fedilab/android/asynctasks/SyncTimelinesAsyncTask.java b/app/src/main/java/app/fedilab/android/asynctasks/SyncTimelinesAsyncTask.java index fe4117eb4..8e45cf42b 100644 --- a/app/src/main/java/app/fedilab/android/asynctasks/SyncTimelinesAsyncTask.java +++ b/app/src/main/java/app/fedilab/android/asynctasks/SyncTimelinesAsyncTask.java @@ -245,60 +245,63 @@ public class SyncTimelinesAsyncTask extends AsyncTask { } } APIResponse apiResponse = null; - List lists = null; - try { - apiResponse = new API(contextReference.get()).getLists(); - lists = apiResponse.getLists(); - }catch (Exception ignored){ } - - if( lists != null && lists.size() > 0){ - //Loop through results - for(app.fedilab.android.client.Entities.List list: lists){ - boolean isInDb = false; - ManageTimelines timelines_tmp = null; - for(ManageTimelines manageTimeline: manageTimelines){ - if( manageTimeline.getListTimeline() == null ) - continue; - if(manageTimeline.getListTimeline().getId().equals(list.getId())){ - isInDb = true; - timelines_tmp = manageTimeline; - break; - } - } - if( !isInDb){ - ManageTimelines manageTL = new ManageTimelines(); - manageTL.setListTimeline(list); - manageTL.setDisplayed(true); - manageTL.setType(ManageTimelines.Type.LIST); - manageTL.setPosition(manageTimelines.size()); - new TimelinesDAO(contextReference.get(), db).insert(manageTL); - }else{ - //Update list - timelines_tmp.setListTimeline(list); - new TimelinesDAO(contextReference.get(), db).update(timelines_tmp); - } + if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { + List lists = null; + try { + apiResponse = new API(contextReference.get()).getLists(); + lists = apiResponse.getLists(); + } catch (Exception ignored) { } - for(ManageTimelines manageTimelines: manageTimelines){ - if( manageTimelines.getListTimeline() == null ) - continue; - boolean shouldBeRemoved = true; - for(app.fedilab.android.client.Entities.List list: lists){ - if( list.getId().equals(manageTimelines.getListTimeline().getId())){ - shouldBeRemoved = false; + + if (lists != null && lists.size() > 0) { + //Loop through results + for (app.fedilab.android.client.Entities.List list : lists) { + boolean isInDb = false; + ManageTimelines timelines_tmp = null; + for (ManageTimelines manageTimeline : manageTimelines) { + if (manageTimeline.getListTimeline() == null) + continue; + if (manageTimeline.getListTimeline().getId().equals(list.getId())) { + isInDb = true; + timelines_tmp = manageTimeline; + break; + } + } + if (!isInDb) { + ManageTimelines manageTL = new ManageTimelines(); + manageTL.setListTimeline(list); + manageTL.setDisplayed(true); + manageTL.setType(ManageTimelines.Type.LIST); + manageTL.setPosition(manageTimelines.size()); + new TimelinesDAO(contextReference.get(), db).insert(manageTL); + } else { + //Update list + timelines_tmp.setListTimeline(list); + new TimelinesDAO(contextReference.get(), db).update(timelines_tmp); } } - if( shouldBeRemoved){ + for (ManageTimelines manageTimelines : manageTimelines) { + if (manageTimelines.getListTimeline() == null) + continue; + boolean shouldBeRemoved = true; + for (app.fedilab.android.client.Entities.List list : lists) { + if (list.getId().equals(manageTimelines.getListTimeline().getId())) { + shouldBeRemoved = false; + } + } + if (shouldBeRemoved) { + new TimelinesDAO(contextReference.get(), db).remove(manageTimelines); + } + } + } else { + for (ManageTimelines manageTimelines : manageTimelines) { + if (manageTimelines.getListTimeline() == null) + continue; new TimelinesDAO(contextReference.get(), db).remove(manageTimelines); } } - }else{ - for(ManageTimelines manageTimelines: manageTimelines){ - if( manageTimelines.getListTimeline() == null ) - continue; - new TimelinesDAO(contextReference.get(), db).remove(manageTimelines); - } - } + } for (Iterator it = manageTimelines.iterator(); it.hasNext();) { if (!it.next().isDisplayed()) { it.remove(); diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index 6f84ba351..488fc86c9 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -3151,25 +3151,27 @@ public class Helper { .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) .into(imageView); }catch (Exception e){ - if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || BaseMainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { - Glide.with(imageView.getContext()) - .asDrawable() - .load(R.drawable.missing) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) - .into(imageView); - }else if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE){ - Glide.with(imageView.getContext()) - .asDrawable() - .load(R.drawable.missing_peertube) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) - .into(imageView); - }else if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA){ - Glide.with(imageView.getContext()) - .asDrawable() - .load(R.drawable.gnu_default_avatar) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) - .into(imageView); - } + try { + if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || BaseMainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { + Glide.with(imageView.getContext()) + .asDrawable() + .load(R.drawable.missing) + .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) + .into(imageView); + } else if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) { + Glide.with(imageView.getContext()) + .asDrawable() + .load(R.drawable.missing_peertube) + .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) + .into(imageView); + } else if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) { + Glide.with(imageView.getContext()) + .asDrawable() + .load(R.drawable.gnu_default_avatar) + .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) + .into(imageView); + } + }catch (Exception ignored){} } }else{ try { @@ -3179,25 +3181,27 @@ public class Helper { .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) .into(imageView); }catch (Exception e){ - if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || BaseMainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { - Glide.with(imageView.getContext()) - .asDrawable() - .load(R.drawable.missing) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) - .into(imageView); - }else if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE){ - Glide.with(imageView.getContext()) - .asDrawable() - .load(R.drawable.missing_peertube) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) - .into(imageView); - }else if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA){ - Glide.with(imageView.getContext()) - .asDrawable() - .load(R.drawable.gnu_default_avatar) - .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) - .into(imageView); - } + try { + if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.MASTODON || BaseMainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA) { + Glide.with(imageView.getContext()) + .asDrawable() + .load(R.drawable.missing) + .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) + .into(imageView); + } else if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) { + Glide.with(imageView.getContext()) + .asDrawable() + .load(R.drawable.missing_peertube) + .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) + .into(imageView); + } else if (MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.GNU || MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.FRIENDICA) { + Glide.with(imageView.getContext()) + .asDrawable() + .load(R.drawable.gnu_default_avatar) + .apply(new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(10))) + .into(imageView); + } + }catch (Exception ignored){} } }