yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-05 19:41:57 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3301 from deltachat/adb/issue-3300

Browse source 
revert hack introduced in #2835
This commit is contained in:
Asiel Díaz Benítez 2024-09-17 22:57:47 +02:00 • committed by GitHub
commit 5c9afb910d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -35,7 +35,6 @@ import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.PowerManager;
import android.os.Vibrator; import android.os.Vibrator;
import android.provider.Browser; import android.provider.Browser;
import android.text.Editable; import android.text.Editable;
@ -301,12 +300,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
DcHelper.getNotificationCenter(this).updateVisibleChat(dcContext.getAccountId(), chatId); DcHelper.getNotificationCenter(this).updateVisibleChat(dcContext.getAccountId(), chatId);
attachmentManager.onResume(); attachmentManager.onResume();
// action bar might be hidden by workaround in onStop()
ActionBar supportActionBar = getSupportActionBar();
if (supportActionBar != null && !supportActionBar.isShowing()) {
supportActionBar.show();
}
} }
@Override @Override
@ -322,23 +315,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
AudioSlidePlayer.stopAll(); AudioSlidePlayer.stopAll();
} }
@Override
public void onStop() {
super.onStop();
// hack/workaround to fix https://github.com/deltachat/deltachat-android/issues/2798
// the real cause of the problem is still unknown but hiding the action bar here fixes it
if ( Build.VERSION.SDK_INT >= 34) {
ActionBar supportActionBar = getSupportActionBar();
if (supportActionBar != null && container.isKeyboardOpen()) {
PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
if (!pm.isInteractive()) {
supportActionBar.hide();
}
}
}
}
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
Log.i(TAG, "onConfigurationChanged(" + newConfig.orientation + ")"); Log.i(TAG, "onConfigurationChanged(" + newConfig.orientation + ")");