diff options
| author | stom79 <tschneider.ac@gmail.com> | 2019-01-06 18:18:13 +0100 |
|---|---|---|
| committer | stom79 <tschneider.ac@gmail.com> | 2019-01-06 18:18:13 +0100 |
| commit | dc6909ddee4eeb09cafb7bcdb99672a42d87019e (patch) | |
| tree | ddb0cf7c20da7e7b3d6a5c4632fb0374d7b188cf | |
| parent | 585dafea870abd764123c1f4798aee476e62ca21 (diff) | |
Some edges fixes
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/build.gradle b/app/build.gradle index c2567b6a7..a6944fb6f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 16 targetSdkVersion 28 - versionCode 221 - versionName "1.63.0-beta-2" + versionCode 222 + versionName "1.63.0" multiDexEnabled true } dexOptions { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index 6024239ea..02bfcfbf5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -193,7 +193,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn statusListAdapter = new StatusListAdapter(context, type, targetedId, isOnWifi, this.statuses); lv_status.setAdapter(statusListAdapter); }else { - if( remoteInstance != null) //if it's a Peertube account connected + if( remoteInstance != null && MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PEERTUBE) //if it's a Peertube account connected remoteInstance = account.getInstance(); BaseMainActivity.displayPeertube = remoteInstance; peertubeAdapater = new PeertubeAdapter(context, remoteInstance, this.peertubes); @@ -319,6 +319,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn else if( type == RetrieveFeedsAsyncTask.Type.REMOTE_INSTANCE || type == RetrieveFeedsAsyncTask.Type.PIXELFED) { if( search_peertube == null) { if( remote_channel_name == null) { + asyncTask = new RetrieveFeedsAsyncTask(context, type, remoteInstance, max_id, DisplayStatusFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } else |