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

Fixes

This commit is contained in:
Grishka 2023-10-01 23:11:33 +03:00
parent c5b52b2781
commit 1feccdc26d
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
View File

@ -176,7 +176,7 @@ public class HashtagTimelineFragment extends StatusListFragment{
} }
private void updateHeader(){ private void updateHeader(){
if(hashtag==null) if(hashtag==null || getActivity()==null)
return; return;
if(hashtag.history!=null && !hashtag.history.isEmpty()){ if(hashtag.history!=null && !hashtag.history.isEmpty()){

4
mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
View File

@ -822,7 +822,9 @@ public class PhotoViewer implements ZoomPanView.Listener{
@Override @Override
public boolean onError(MediaPlayer mp, int what, int extra){ public boolean onError(MediaPlayer mp, int what, int extra){
Log.e(TAG, "video player onError() called with: mp = ["+mp+"], what = ["+what+"], extra = ["+extra+"]"); Log.e(TAG, "video player onError() called with: mp = ["+mp+"], what = ["+what+"], extra = ["+extra+"]");
return false; Toast.makeText(activity, R.string.error_playing_video, Toast.LENGTH_SHORT).show();
onStartSwipeToDismissTransition(0f);
return true;
} }
public void prepareAndStartPlayer(){ public void prepareAndStartPlayer(){

3
mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/ZoomPanView.java
View File

@ -193,6 +193,9 @@ public class ZoomPanView extends FrameLayout implements ScaleGestureDetector.OnS
private float prepareTransitionCropRect(Rect rect){ private float prepareTransitionCropRect(Rect rect){
float initialScale; float initialScale;
if(rect.isEmpty()){
rect.set(rect.centerX()-child.getWidth()/2, rect.centerY()-child.getHeight()/2, rect.centerX()+child.getWidth()/2, rect.centerY()+child.getWidth()/2);
}
float scaleW=rect.width()/(float)child.getWidth(); float scaleW=rect.width()/(float)child.getWidth();
float scaleH=rect.height()/(float)child.getHeight(); float scaleH=rect.height()/(float)child.getHeight();
if(scaleW>scaleH){ if(scaleW>scaleH){

2
mastodon/src/main/res/values/strings.xml
View File

@ -608,4 +608,6 @@
<item quantity="one">%,d post today</item> <item quantity="one">%,d post today</item>
<item quantity="other">%,d posts today</item> <item quantity="other">%,d posts today</item>
</plurals> </plurals>
<string name="error_playing_video">Error playing video</string>
</resources> </resources>