Skip to content
Snippets Groups Projects
Commit f56032d8 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed a bug where ReAuth didn’t actually ReAuth, but left a connection open

parent 5e0be8b4
Branches
Tags
No related merge requests found
......@@ -69,7 +69,6 @@ public class QuasselService extends Service {
public void stopBackgroundThread() {
if (bgThread != null) bgThread.close();
bgThread = null;
notify(bgThread);
}
public void addCallback(Consumer<ClientBackgroundThread> consumer) {
......
......@@ -158,6 +158,7 @@ public class MainActivity extends BoundActivity {
return true;
case R.id.action_reauth:
context.settings().lastAccount.set("");
stopConnection();
finish();
return true;
default:
......
......@@ -37,8 +37,8 @@ import de.kuschku.quasseldroid_ng.ui.theme.AppContext;
import de.kuschku.quasseldroid_ng.util.accounts.Account;
public abstract class BoundActivity extends AppCompatActivity {
protected AppContext context = new AppContext();
private QuasselService.LocalBinder binder;
private ServiceConnection connection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
......@@ -56,8 +56,6 @@ public abstract class BoundActivity extends AppCompatActivity {
}
};
protected AppContext context = new AppContext();
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
ServiceHelper.initTheme(context, this);
......@@ -102,4 +100,10 @@ public abstract class BoundActivity extends AppCompatActivity {
provider.event.registerSticky(this);
context.withProvider(provider);
}
protected void stopConnection() {
if (binder != null) {
binder.stopBackgroundThread();
}
}
}
......@@ -37,8 +37,8 @@ import de.kuschku.quasseldroid_ng.ui.theme.AppContext;
import de.kuschku.quasseldroid_ng.util.accounts.Account;
public abstract class BoundFragment extends Fragment {
protected AppContext context = new AppContext();
private QuasselService.LocalBinder binder;
private ServiceConnection connection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
......@@ -56,8 +56,6 @@ public abstract class BoundFragment extends Fragment {
}
};
protected AppContext context = new AppContext();
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
ServiceHelper.initTheme(context, getActivity());
......@@ -101,4 +99,10 @@ public abstract class BoundFragment extends Fragment {
provider.event.registerSticky(this);
context.withProvider(provider);
}
protected void stopConnection() {
if (binder != null) {
binder.stopBackgroundThread();
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment