mirror of
				https://github.com/vector-im/element-web.git
				synced 2025-11-04 10:11:03 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
		
						commit
						ab6a48be7e
					
				@ -273,6 +273,12 @@ function textForCallHangupEvent(event) {
 | 
			
		||||
            reason = _t('(could not connect media)');
 | 
			
		||||
        } else if (eventContent.reason === "invite_timeout") {
 | 
			
		||||
            reason = _t('(no answer)');
 | 
			
		||||
        } else if (eventContent.reason === "user hangup") {
 | 
			
		||||
            // workaround for https://github.com/vector-im/riot-web/issues/5178
 | 
			
		||||
            // it seems Android randomly sets a reason of "user hangup" which is
 | 
			
		||||
            // interpreted as an error code :(
 | 
			
		||||
            // https://github.com/vector-im/riot-android/issues/2623
 | 
			
		||||
            reason = '';
 | 
			
		||||
        } else {
 | 
			
		||||
            reason = _t('(unknown failure: %(reason)s)', {reason: eventContent.reason});
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user