Skip to content
This repository was archived by the owner on Aug 2, 2023. It is now read-only.

Commit 4aa6dc6

Browse files
committed
Remove unnecessary log, make status and log fragments more reliable (TODO: use service binding or weakreference?)
1 parent 1ec7cfb commit 4aa6dc6

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

app/src/main/java/link/infra/sslsocks/gui/main/LogFragment.java

+7
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import link.infra.sslsocks.R;
1919
import link.infra.sslsocks.service.ServiceUtils;
20+
import link.infra.sslsocks.service.StunnelIntentService;
2021

2122

2223
/**
@@ -86,4 +87,10 @@ public void onReceive(Context context, Intent intent) {
8687
manager.registerReceiver(clearLogReceiver, clearLogIntentFilter);
8788
}
8889

90+
@Override
91+
public void onResume() {
92+
super.onResume();
93+
StunnelIntentService.checkStatus(getActivity());
94+
}
95+
8996
}

app/src/main/java/link/infra/sslsocks/gui/main/MainActivity.java

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import android.support.v4.view.ViewPager;
1616
import android.support.v7.app.AppCompatActivity;
1717
import android.support.v7.widget.Toolbar;
18-
import android.util.Log;
1918
import android.view.LayoutInflater;
2019
import android.view.Menu;
2120
import android.view.MenuItem;
@@ -298,7 +297,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
298297
if (keysFragment != null) {
299298
KeyFragment frag = keysFragment.get();
300299
if (frag != null) {
301-
Log.d("hi", "hmm");
302300
frag.updateList(this); // Ensure list is up to date
303301
}
304302
}

app/src/main/java/link/infra/sslsocks/gui/main/StartFragment.java

+7
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import link.infra.sslsocks.R;
2222
import link.infra.sslsocks.service.ServiceUtils;
23+
import link.infra.sslsocks.service.StunnelIntentService;
2324

2425

2526
/**
@@ -137,4 +138,10 @@ public interface OnFragmentInteractionListener {
137138
void onFragmentStartInteraction();
138139
void onFragmentStopInteraction();
139140
}
141+
142+
@Override
143+
public void onResume() {
144+
super.onResume();
145+
StunnelIntentService.checkStatus(getActivity());
146+
}
140147
}

0 commit comments

Comments
 (0)