TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 17:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix stickers in image editor.

Browse Source 
Fixes #9012
This commit is contained in:
Alan Evans 2019-09-02 10:18:07 -04:00 committed by Greyson Parrelli
parent 8814a0d949
commit bb7be66efe
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
View File

@ -17,6 +17,7 @@
package org.thoughtcrime.securesms.scribbles; package org.thoughtcrime.securesms.scribbles;
import android.content.Intent; import android.content.Intent;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.material.tabs.TabLayout; import com.google.android.material.tabs.TabLayout;
@ -33,8 +34,6 @@ public class StickerSelectActivity extends FragmentActivity implements StickerSe
private static final String TAG = StickerSelectActivity.class.getSimpleName(); private static final String TAG = StickerSelectActivity.class.getSimpleName();
public static final String EXTRA_STICKER_FILE = "extra_sticker_file";
private static final int[] TAB_TITLES = new int[] { private static final int[] TAB_TITLES = new int[] {
R.drawable.ic_tag_faces_white_24dp, R.drawable.ic_tag_faces_white_24dp,
R.drawable.ic_work_white_24dp, R.drawable.ic_work_white_24dp,
@ -71,7 +70,7 @@ public class StickerSelectActivity extends FragmentActivity implements StickerSe
@Override @Override
public void onStickerSelected(String name) { public void onStickerSelected(String name) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.putExtra(EXTRA_STICKER_FILE, name); intent.setData(Uri.parse("file:///android_asset/" + name));
setResult(RESULT_OK, intent); setResult(RESULT_OK, intent);
finish(); finish();
} }