diff options
Diffstat (limited to 'app/java/src')
| -rw-r--r-- | app/java/src/DNSProxyService.java | 6 | ||||
| -rw-r--r-- | app/java/src/MainActivity.java | 16 | ||||
| -rw-r--r-- | app/java/src/WifiListenerService.java | 8 |
3 files changed, 7 insertions, 23 deletions
diff --git a/app/java/src/DNSProxyService.java b/app/java/src/DNSProxyService.java index 5a3d70f..10e127b 100644 --- a/app/java/src/DNSProxyService.java +++ b/app/java/src/DNSProxyService.java @@ -153,12 +153,12 @@ public class DNSProxyService extends VpnService { Notification notification = new Notification.Builder(this, DNSProxyService.NOTIFICATION_CHANNEL_ID) .setSmallIcon(R.drawable.logo) - .setContentTitle("Pihole DNS Proxy") - .setContentText("Running with " + DNSProxyService.PIHOLE_ADDRESS) + .setContentTitle(getString(R.string.app_label)) + .setContentText(String.format(getString(R.string.dns_proxy_service__notification__text), DNSProxyService.PIHOLE_ADDRESS)) .setContentIntent(PendingIntent.getActivity(this, 0, new Intent(this, MainActivity.class), Intent.FLAG_ACTIVITY_NEW_TASK)) .addAction( R.drawable.logo, - "Stop", + getString(R.string.dns_proxy_service__notification__action__stop), PendingIntent.getService(this, 0, (new Intent(this, DNSProxyService.class)).setAction(DNSProxyService.ACTION_STOP), PendingIntent.FLAG_IMMUTABLE diff --git a/app/java/src/MainActivity.java b/app/java/src/MainActivity.java index 3d2c197..7b0f375 100644 --- a/app/java/src/MainActivity.java +++ b/app/java/src/MainActivity.java @@ -157,14 +157,6 @@ public class MainActivity extends Activity { */ private void startDNSProxyService() { DNSProxyService.start(this); - - Toast - .makeText( - this, - getString(R.string.service_starting), - Toast.LENGTH_SHORT - ) - .show(); } /** @@ -172,13 +164,5 @@ public class MainActivity extends Activity { */ private void stopDNSProxyService() { DNSProxyService.stop(this); - - Toast - .makeText( - this, - getString(R.string.service_stopping), - Toast.LENGTH_SHORT - ) - .show(); } } diff --git a/app/java/src/WifiListenerService.java b/app/java/src/WifiListenerService.java index da4c337..0920677 100644 --- a/app/java/src/WifiListenerService.java +++ b/app/java/src/WifiListenerService.java @@ -160,12 +160,12 @@ public class WifiListenerService extends Service Notification notification = new Notification.Builder(this, WifiListenerService.NOTIFICATION_CHANNEL_ID) .setSmallIcon(R.drawable.logo) - .setContentTitle("Pihole DNS Proxy - WiFi Listener") - .setContentText("Listening for WiFi connection change") + .setContentTitle(getString(R.string.app_label) + " - WiFi Listener") + .setContentText(getString(R.string.wifi_listener_service__notification__text)) .setContentIntent(PendingIntent.getActivity(this, 0, new Intent(this, SettingsActivity.class), Intent.FLAG_ACTIVITY_NEW_TASK)) .addAction( R.drawable.logo, - "Stop Listener", + getString(R.string.wifi_listener_service__notification__action__stop_listener), PendingIntent.getService(this, 0, (new Intent(this, WifiListenerService.class)).setAction(WifiListenerService.ACTION_STOP_SET_PREFERENCE), PendingIntent.FLAG_IMMUTABLE @@ -173,7 +173,7 @@ public class WifiListenerService extends Service ) .addAction( R.drawable.logo, - "Start Proxy", + getString(R.string.wifi_listener_service__notification__action__start_proxy), PendingIntent.getService(this, 0, (new Intent(this, DNSProxyService.class)).setAction(DNSProxyService.ACTION_START), PendingIntent.FLAG_IMMUTABLE |