From 9fa8359cab9db2182016f7ed4c278355e734331b Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 10 Sep 2017 15:54:06 +0200 Subject: [PATCH] Fixes potential crashes when retrieving the relationship --- .../fr/gouv/etalab/mastodon/activities/AboutActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java index 80e693875..0c5e78083 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/AboutActivity.java @@ -23,6 +23,7 @@ import android.os.AsyncTask; import android.os.Bundle; import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; +import android.util.Log; import android.view.MenuItem; import android.view.View; import android.widget.Button; @@ -244,14 +245,14 @@ public class AboutActivity extends AppCompatActivity implements OnRetrieveRemote return; } for( int i = 0 ; i < developers.size() ; i++){ - if( developers.get(i).getId().equals(relationship.getId())){ + if( contributors.get(i).getId() != null && developers.get(i).getId().equals(relationship.getId())){ developers.get(i).setFollowing(relationship.isFollowing() || userId.trim().equals(relationship.getId())); accountSearchWebAdapterDeveloper.notifyDataSetChanged(); break; } } for( int i = 0 ; i < contributors.size() ; i++){ - if( contributors.get(i).getId().equals(relationship.getId())){ + if( contributors.get(i).getId() != null && contributors.get(i).getId().equals(relationship.getId())){ contributors.get(i).setFollowing(relationship.isFollowing() || userId.trim().equals(relationship.getId())); accountSearchWebAdapterContributors.notifyDataSetChanged(); break;