kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix crash when searching for stickers in media editor.
rodzic
e01574c6b4
commit
382edd7157
|
@ -18,11 +18,13 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
|
||||||
import org.thoughtcrime.securesms.database.model.StickerRecord;
|
import org.thoughtcrime.securesms.database.model.StickerRecord;
|
||||||
import org.thoughtcrime.securesms.keyboard.KeyboardPage;
|
import org.thoughtcrime.securesms.keyboard.KeyboardPage;
|
||||||
import org.thoughtcrime.securesms.keyboard.KeyboardPagerViewModel;
|
import org.thoughtcrime.securesms.keyboard.KeyboardPagerViewModel;
|
||||||
|
import org.thoughtcrime.securesms.keyboard.sticker.StickerKeyboardPageFragment;
|
||||||
|
import org.thoughtcrime.securesms.keyboard.sticker.StickerSearchDialogFragment;
|
||||||
import org.thoughtcrime.securesms.stickers.StickerEventListener;
|
import org.thoughtcrime.securesms.stickers.StickerEventListener;
|
||||||
import org.thoughtcrime.securesms.stickers.StickerManagementActivity;
|
import org.thoughtcrime.securesms.stickers.StickerManagementActivity;
|
||||||
import org.thoughtcrime.securesms.util.ViewUtil;
|
import org.thoughtcrime.securesms.util.ViewUtil;
|
||||||
|
|
||||||
public final class ImageEditorStickerSelectActivity extends AppCompatActivity implements StickerEventListener, MediaKeyboard.MediaKeyboardListener {
|
public final class ImageEditorStickerSelectActivity extends AppCompatActivity implements StickerEventListener, MediaKeyboard.MediaKeyboardListener, StickerKeyboardPageFragment.Callback {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void attachBaseContext(@NonNull Context newBase) {
|
protected void attachBaseContext(@NonNull Context newBase) {
|
||||||
|
@ -71,6 +73,12 @@ public final class ImageEditorStickerSelectActivity extends AppCompatActivity im
|
||||||
startActivity(StickerManagementActivity.getIntent(ImageEditorStickerSelectActivity.this));
|
startActivity(StickerManagementActivity.getIntent(ImageEditorStickerSelectActivity.this));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void openStickerSearch() {
|
||||||
|
StickerSearchDialogFragment.show(getSupportFragmentManager());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
if (item.getItemId() == android.R.id.home) {
|
if (item.getItemId() == android.R.id.home) {
|
||||||
|
|
Ładowanie…
Reference in New Issue