Added auto switch back like described in issue #59 #61
There are no files selected for viewing
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package ru.karasevm.privatednstoggle.service | ||
|
|
||
| import android.content.BroadcastReceiver | ||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.util.Log | ||
| import ru.karasevm.privatednstoggle.util.PreferenceHelper | ||
| import ru.karasevm.privatednstoggle.util.PreferenceHelper.revertMode | ||
| import ru.karasevm.privatednstoggle.util.PreferenceHelper.revertProvider | ||
| import ru.karasevm.privatednstoggle.util.PrivateDNSUtils | ||
| import ru.karasevm.privatednstoggle.util.PreferenceHelper.revertScheduledAt | ||
| import android.widget.Toast | ||
| import android.app.NotificationManager | ||
| import android.app.NotificationChannel | ||
| import androidx.core.app.NotificationCompat | ||
|
|
||
|
|
||
| class RevertReceiver : BroadcastReceiver() { | ||
| companion object { | ||
| private const val TAG = "RevertReceiver" | ||
| } | ||
|
|
||
| private fun showNotification(context: Context, message: String) { | ||
|
Owner
There was a problem hiding this comment. The app targets the latest recommended sdk, please read the notification api reference and ensure it works properly on modern versions of android. Don't request the notification permission unless user explicitly turns on the revert feature. |
||
| try { | ||
| val channelId = "revert_debug" | ||
| val notificationId = 12345 | ||
|
|
||
|
|
||
| val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager | ||
|
|
||
| // Create notification channel for Android 8+ | ||
| if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) { | ||
|
Owner
There was a problem hiding this comment. Private DNS feature was added in A9, minSdk is 28, this check is useless. |
||
| val channel = NotificationChannel(channelId, "Revert Debug", NotificationManager.IMPORTANCE_HIGH) | ||
| notificationManager.createNotificationChannel(channel) | ||
| } | ||
|
|
||
| val notification = NotificationCompat.Builder(context, channelId) | ||
| .setContentTitle("DNS Revert") | ||
| .setContentText(message) | ||
| .setSmallIcon(android.R.drawable.ic_dialog_info) | ||
| .setPriority(NotificationCompat.PRIORITY_HIGH) | ||
| .setAutoCancel(true) | ||
| .build() | ||
|
|
||
| notificationManager.notify(notificationId, notification) | ||
| } catch (e: Exception) { | ||
| Log.e(TAG, "Failed to show notification: ${e.message}") | ||
| } | ||
| } | ||
|
|
||
| override fun onReceive(context: Context, intent: Intent) { | ||
| Log.d(TAG, "onReceive: revert alarm fired - ENTERING BROADCAST RECEIVER") | ||
|
|
||
| val prefs = PreferenceHelper.defaultPreference(context) | ||
| val mode = prefs.revertMode | ||
| val provider = prefs.revertProvider | ||
| val scheduledAt = prefs.revertScheduledAt | ||
|
|
||
| val logMsg = "onReceive: stored revert mode=$mode provider=$provider scheduledAt=$scheduledAt now=${System.currentTimeMillis()}" | ||
| Log.d(TAG, logMsg) | ||
|
|
||
| if (mode.isNullOrBlank()) { | ||
| Log.d(TAG, "onReceive: nothing to revert") | ||
| return | ||
| } | ||
|
|
||
| // Apply provider first if private | ||
| if (mode.equals(PrivateDNSUtils.DNS_MODE_PRIVATE, true)) { | ||
| PrivateDNSUtils.setPrivateProvider(context.contentResolver, if (provider.isNullOrBlank()) null else provider) | ||
| } else { | ||
| // when reverting to non-private, preserve provider value | ||
| PrivateDNSUtils.setPrivateProvider(context.contentResolver, provider) | ||
| } | ||
|
|
||
| PrivateDNSUtils.setPrivateMode(context.contentResolver, mode) | ||
|
|
||
| val revertMsg = "Private DNS reverted to $mode" | ||
|
Owner
There was a problem hiding this comment. Don't hardcode strings. If you need formatting, see |
||
|
|
||
| // Show notification (persistent & visible) | ||
| showNotification(context, revertMsg) | ||
|
|
||
| // Notify user via toast for debugging | ||
| try { | ||
| Toast.makeText(context, revertMsg, Toast.LENGTH_LONG).show() | ||
| } catch (e: Exception) { | ||
| Log.w(TAG, "onReceive: failed to show toast: ${e.message}") | ||
| } | ||
|
|
||
| // clear saved revert info | ||
| prefs.revertMode = null | ||
| prefs.revertProvider = null | ||
|
|
||
| val finalMsg = "onReceive: reverted to mode=$mode provider=$provider" | ||
| Log.d(TAG, finalMsg) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package ru.karasevm.privatednstoggle.service | ||
|
|
||
| import android.app.AlarmManager | ||
| import android.app.PendingIntent | ||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.os.SystemClock | ||
| import ru.karasevm.privatednstoggle.util.PreferenceHelper | ||
| import java.util.concurrent.TimeUnit | ||
| import ru.karasevm.privatednstoggle.util.PreferenceHelper.revertScheduledAt | ||
| import android.util.Log | ||
|
|
||
| object RevertScheduler { | ||
| private const val TAG = "RevertScheduler" | ||
| private const val ACTION_REVERT = "ru.karasevm.privatednstoggle.ACTION_REVERT" | ||
|
|
||
| fun scheduleRevert(context: Context, minutes: Int) { | ||
| val prefs = PreferenceHelper.defaultPreference(context) | ||
|
|
||
| val logMsg1 = "scheduleRevert: CALLED with minutes=$minutes" | ||
| Log.d(TAG, logMsg1) | ||
|
|
||
| // Build intent to fire our RevertReceiver | ||
| val intent = Intent(context, RevertReceiver::class.java).apply { | ||
| action = ACTION_REVERT | ||
| setPackage(context.packageName) | ||
| } | ||
|
|
||
| val pending = PendingIntent.getBroadcast( | ||
| context, | ||
| 0, | ||
| intent, | ||
| PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE | ||
| ) | ||
|
|
||
| val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager | ||
|
|
||
| // Use elapsed realtime + minutes | ||
| val triggerAt = SystemClock.elapsedRealtime() + TimeUnit.MINUTES.toMillis(minutes.toLong()) | ||
| val triggerAtWall = System.currentTimeMillis() + TimeUnit.MINUTES.toMillis(minutes.toLong()) | ||
|
|
||
| val logMsg2 = "scheduleRevert: setting alarm triggerAt(elapsed)=$triggerAt triggerAt(wall)=$triggerAtWall" | ||
| Log.d(TAG, logMsg2) | ||
|
|
||
| try { | ||
| alarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, triggerAt, pending) | ||
|
Owner
There was a problem hiding this comment. See comment in the manifest, replace either with set or setAndAllowWhileIdle. |
||
|
|
||
| val logMsg3 = "scheduleRevert: alarm SET SUCCESSFULLY" | ||
| Log.d(TAG, logMsg3) | ||
| } catch (e: Exception) { | ||
| val logMsg3 = "scheduleRevert: ERROR setting alarm: ${e.message}" | ||
| Log.e(TAG, logMsg3) | ||
| } | ||
|
|
||
| // Persist scheduled time for debugging | ||
| prefs.revertScheduledAt = triggerAtWall | ||
| val logMsg4 = "scheduleRevert: persisted scheduled_at=$triggerAtWall" | ||
| Log.d(TAG, logMsg4) | ||
| } | ||
|
|
||
| fun cancelRevert(context: Context) { | ||
| val logMsg1 = "cancelRevert: CALLED" | ||
| Log.d(TAG, logMsg1) | ||
|
|
||
| val intent = Intent(context, RevertReceiver::class.java).apply { | ||
| action = ACTION_REVERT | ||
| setPackage(context.packageName) | ||
| } | ||
| val pending = PendingIntent.getBroadcast( | ||
| context, | ||
| 0, | ||
| intent, | ||
| PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE | ||
| ) | ||
| val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager | ||
| alarmManager.cancel(pending) | ||
| val prefs = PreferenceHelper.defaultPreference(context) | ||
| prefs.revertScheduledAt = 0L | ||
| val logMsg2 = "cancelRevert: CANCELLED pending revert" | ||
| Log.d(TAG, logMsg2) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer not using restricted permissions. To quote the API reference "This is only intended for use by apps that rely on exact alarms for their core functionality. You should continue using SCHEDULE_EXACT_ALARM if your app needs exact alarms for a secondary feature that users may or may not use within your app."