Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-03 19:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Workaround bug in fragment activity"

Browse Source 
This reverts commit 95d101c9f2.
This commit is contained in:
M66B
2018-11-16 18:10:44 +01:00
parent dbc3b0703a
commit 475833ab6f
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/eu/faircode/email/ActivityCompose.java
View File

@@ -27,7 +27,6 @@ import android.view.MenuItem;
import java.util.ArrayList;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
@@ -140,14 +139,4 @@ public class ActivityCompose extends ActivityBilling implements FragmentManager.
return false;
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
if (resultCode == RESULT_CANCELED) {
int request = requestCode & 0xffff;
if (request == REQUEST_IMAGE || request == REQUEST_ATTACHMENT)
return;
}
super.onActivityResult(requestCode, resultCode, data);
}
}

11
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@@ -28,7 +28,6 @@ import android.view.MenuItem;
import java.util.List;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
@@ -107,16 +106,6 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
if (resultCode == RESULT_CANCELED) {
int request = requestCode & 0xffff;
if (request == REQUEST_EXPORT || request == REQUEST_IMPORT)
return;
}
super.onActivityResult(requestCode, resultCode, data);
}
BroadcastReceiver receiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {