Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1016-reblog-runtime-error' into 'master'

Browse Source 
Runtime error fix due to window requests

Closes #1016 and #1007

See merge request !576
This commit is contained in:
akwizgran
2017-08-01 09:25:39 +00:00
parent a9437f7985 8455569e88
commit 7c4dd991b9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/blog/ReblogActivity.java
View File

@@ -18,8 +18,8 @@ public class ReblogActivity extends BriarActivity implements
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setSceneTransitionAnimation(); setSceneTransitionAnimation();
super.onCreate(savedInstanceState);
Intent intent = getIntent(); Intent intent = getIntent();
byte[] groupId = intent.getByteArrayExtra(GROUP_ID); byte[] groupId = intent.getByteArrayExtra(GROUP_ID);

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ConversationActivity.java
View File

@@ -186,8 +186,8 @@ public class ConversationActivity extends BriarActivity
@SuppressWarnings("ConstantConditions") @SuppressWarnings("ConstantConditions")
@Override @Override
public void onCreate(@Nullable Bundle state) { public void onCreate(@Nullable Bundle state) {
super.onCreate(state);
setSceneTransitionAnimation(); setSceneTransitionAnimation();
super.onCreate(state);
Intent i = getIntent(); Intent i = getIntent();
int id = i.getIntExtra(CONTACT_ID, -1); int id = i.getIntExtra(CONTACT_ID, -1);