mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed PGP test memory leak

This commit is contained in:
M66B 2022-05-01 14:02:56 +02:00
parent a04025b8d0
commit 5909df693c
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
View File

@ -79,7 +79,8 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
public class FragmentOptionsEncryption extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
public class FragmentOptionsEncryption extends FragmentBase
implements SharedPreferences.OnSharedPreferenceChangeListener, OpenPgpServiceConnection.OnBound {
private ImageButton ibInfo;
private SwitchCompat swSign;
private SwitchCompat swEncrypt;
@ -613,32 +614,33 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
if (pgpService != null && pgpService.isBound())
pgpService.unbindFromService();
tvOpenPgpStatus.setText("Connecting to " + pkg);
pgpService = new OpenPgpServiceConnection(getContext(), pkg, new OpenPgpServiceConnection.OnBound() {
@Override
public void onBound(IOpenPgpService2 service) {
if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
return;
tvOpenPgpStatus.setText("Connected to " + pkg);
}
@Override
public void onError(Exception ex) {
if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
return;
if ("bindService() returned false!".equals(ex.getMessage()))
tvOpenPgpStatus.setText("Not connected");
else {
Log.e(ex);
tvOpenPgpStatus.setText(ex.toString());
}
}
});
tvOpenPgpStatus.setText("Connecting");
pgpService = new OpenPgpServiceConnection(getContext(), pkg, this);
pgpService.bindToService();
} catch (Throwable ex) {
Log.e(ex);
tvOpenPgpStatus.setText(Log.formatThrowable(ex, false));
}
}
@Override
public void onBound(IOpenPgpService2 service) {
if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
return;
tvOpenPgpStatus.setText("Connected");
}
@Override
public void onError(Exception ex) {
if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
return;
if ("bindService() returned false!".equals(ex.getMessage()))
tvOpenPgpStatus.setText("Not connected");
else {
Log.e(ex);
tvOpenPgpStatus.setText(ex.toString());
}
}
}