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
No related branches found
No related tags found
No related merge requests found
...@@ -69,7 +69,6 @@ public class QuasselService extends Service { ...@@ -69,7 +69,6 @@ public class QuasselService extends Service {
public void stopBackgroundThread() { public void stopBackgroundThread() {
if (bgThread != null) bgThread.close(); if (bgThread != null) bgThread.close();
bgThread = null; bgThread = null;
notify(bgThread);
} }
public void addCallback(Consumer<ClientBackgroundThread> consumer) { public void addCallback(Consumer<ClientBackgroundThread> consumer) {
......
...@@ -158,6 +158,7 @@ public class MainActivity extends BoundActivity { ...@@ -158,6 +158,7 @@ public class MainActivity extends BoundActivity {
return true; return true;
case R.id.action_reauth: case R.id.action_reauth:
context.settings().lastAccount.set(""); context.settings().lastAccount.set("");
stopConnection();
finish(); finish();
return true; return true;
default: default:
......
...@@ -37,8 +37,8 @@ import de.kuschku.quasseldroid_ng.ui.theme.AppContext; ...@@ -37,8 +37,8 @@ import de.kuschku.quasseldroid_ng.ui.theme.AppContext;
import de.kuschku.quasseldroid_ng.util.accounts.Account; import de.kuschku.quasseldroid_ng.util.accounts.Account;
public abstract class BoundActivity extends AppCompatActivity { public abstract class BoundActivity extends AppCompatActivity {
protected AppContext context = new AppContext();
private QuasselService.LocalBinder binder; private QuasselService.LocalBinder binder;
private ServiceConnection connection = new ServiceConnection() { private ServiceConnection connection = new ServiceConnection() {
@Override @Override
public void onServiceConnected(ComponentName name, IBinder service) { public void onServiceConnected(ComponentName name, IBinder service) {
...@@ -56,8 +56,6 @@ public abstract class BoundActivity extends AppCompatActivity { ...@@ -56,8 +56,6 @@ public abstract class BoundActivity extends AppCompatActivity {
} }
}; };
protected AppContext context = new AppContext();
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
ServiceHelper.initTheme(context, this); ServiceHelper.initTheme(context, this);
...@@ -102,4 +100,10 @@ public abstract class BoundActivity extends AppCompatActivity { ...@@ -102,4 +100,10 @@ public abstract class BoundActivity extends AppCompatActivity {
provider.event.registerSticky(this); provider.event.registerSticky(this);
context.withProvider(provider); context.withProvider(provider);
} }
protected void stopConnection() {
if (binder != null) {
binder.stopBackgroundThread();
}
}
} }
...@@ -37,8 +37,8 @@ import de.kuschku.quasseldroid_ng.ui.theme.AppContext; ...@@ -37,8 +37,8 @@ import de.kuschku.quasseldroid_ng.ui.theme.AppContext;
import de.kuschku.quasseldroid_ng.util.accounts.Account; import de.kuschku.quasseldroid_ng.util.accounts.Account;
public abstract class BoundFragment extends Fragment { public abstract class BoundFragment extends Fragment {
protected AppContext context = new AppContext();
private QuasselService.LocalBinder binder; private QuasselService.LocalBinder binder;
private ServiceConnection connection = new ServiceConnection() { private ServiceConnection connection = new ServiceConnection() {
@Override @Override
public void onServiceConnected(ComponentName name, IBinder service) { public void onServiceConnected(ComponentName name, IBinder service) {
...@@ -56,8 +56,6 @@ public abstract class BoundFragment extends Fragment { ...@@ -56,8 +56,6 @@ public abstract class BoundFragment extends Fragment {
} }
}; };
protected AppContext context = new AppContext();
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
ServiceHelper.initTheme(context, getActivity()); ServiceHelper.initTheme(context, getActivity());
...@@ -101,4 +99,10 @@ public abstract class BoundFragment extends Fragment { ...@@ -101,4 +99,10 @@ public abstract class BoundFragment extends Fragment {
provider.event.registerSticky(this); provider.event.registerSticky(this);
context.withProvider(provider); 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