Skip to content

Fix Notificarion Bugs & Improve other functionalities #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ android {

dependencies {
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'com.google.android.material:material:1.6.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'androidx.preference:preference:1.2.0'
implementation 'androidx.core:core:1.7.0'
Expand Down
2 changes: 1 addition & 1 deletion app/build/bin/injected/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</service>

<service
android:name=".service.QuickSettingsService"
android:name=".service.QuickSettingsTileService"
android:enabled="@bool/quick_settings_availability"
android:icon="@drawable/ic_launcher_foreground"
android:label="@string/app_name"
Expand Down
2 changes: 1 addition & 1 deletion app/build/bin/merged/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
android:resource="@xml/accessibility" />
</service>
<service
android:name="io.github.ratul.topactivity.service.QuickSettingsService"
android:name="io.github.ratul.topactivity.service.QuickSettingsTileService"
android:enabled="@bool/quick_settings_availability"
android:exported="true"
android:icon="@drawable/ic_launcher_foreground"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
android:resource="@xml/accessibility"/>
</service>
<service
android:name=".service.QuickSettingsService"
android:name=".service.QuickSettingsTileService"
android:enabled="@bool/quick_settings_availability"
android:icon="@drawable/ic_launcher_foreground"
android:label="@string/app_name"
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/io/github/ratul/topactivity/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package io.github.ratul.topactivity;

import android.app.Application;
import io.github.ratul.topactivity.R;
import io.github.ratul.topactivity.model.CrashHandler;
import android.content.Context;
import java.io.File;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,33 @@
import android.app.ActivityManager;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.NotificationChannel;
import android.app.TaskStackBuilder;
import android.app.Notification;
import android.graphics.Color;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.widget.Toast;

import androidx.core.app.NotificationCompat;
import java.util.List;
import javax.crypto.NullCipher;
import java.lang.reflect.AnnotatedElement;

import io.github.ratul.topactivity.utils.DatabaseUtil;
import io.github.ratul.topactivity.R;
import io.github.ratul.topactivity.ui.MainActivity;
import io.github.ratul.topactivity.utils.WindowUtil;
import io.github.ratul.topactivity.service.QuickSettingsService;
import java.lang.reflect.AnnotatedElement;
import android.app.NotificationChannel;
import android.graphics.Color;
import android.app.TaskStackBuilder;
import android.widget.Toast;
import io.github.ratul.topactivity.service.QuickSettingsTileService;

/**
* Created by Ratul on 04/05/2022.
*/
public class NotificationMonitor extends BroadcastReceiver {
public static final int NOTIFICATION_ID = 696969691;
private static String CHANNEL_ID;
private static final int ACTION_STOP = 2;
private static final String EXTRA_NOTIFICATION_ACTION = "command";
public static NotificationCompat.Builder builder;
public static Notification.Builder builder;
public static NotificationManager notifManager;

public static void showNotification(Context context, boolean isPaused) {
Expand All @@ -55,38 +54,40 @@ public static void showNotification(Context context, boolean isPaused) {
}
notifManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

Intent intent = new Intent(context, MainActivity.class);
TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
stackBuilder.addParentStack(MainActivity.class);
stackBuilder.addNextIntent(intent);
PendingIntent pIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
CHANNEL_ID = context.getPackageName() + "_channel_007";
String CHANNEL_ID = context.getPackageName() + "_channel_007";
CharSequence name = "Activity Info";

int importance = NotificationManager.IMPORTANCE_HIGH;
NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID, name, importance);
NotificationChannel mChannel = new NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_MAX);
mChannel.setDescription("Shows current activity info");
mChannel.enableLights(false);
mChannel.enableVibration(false);
mChannel.setShowBadge(false);
mChannel.setImportance(NotificationManager.IMPORTANCE_MAX);
notifManager.createNotificationChannel(mChannel);

builder = new Notification.Builder(context, CHANNEL_ID);
}
else {
builder = new Notification.Builder(context);
}

Intent intent = new Intent(context, MainActivity.class);
TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
stackBuilder.addParentStack(MainActivity.class);
stackBuilder.addNextIntent(intent);
PendingIntent pIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
builder.setContentTitle(context.getString(R.string.is_running, context.getString(R.string.app_name)))
.setSmallIcon(R.drawable.ic_shortcut)
.setContentText(context.getString(R.string.touch_to_open))
.setColor(context.getColor(R.color.layerColor))
.setVisibility(Notification.VISIBILITY_SECRET)
.setOngoing(!isPaused)
.setAutoCancel(true)
.setContentIntent(pIntent);

builder = new NotificationCompat.Builder(context, CHANNEL_ID)
.setContentTitle(context.getString(R.string.is_running, context.getString(R.string.app_name)))
.setSmallIcon(R.drawable.ic_shortcut).setPriority(NotificationCompat.PRIORITY_HIGH)
.setContentText(context.getString(R.string.touch_to_open))
.setColor(context.getColor(R.color.layerColor))
.setVisibility(NotificationCompat.VISIBILITY_SECRET)
.setPriority(NotificationCompat.PRIORITY_MAX)
.setOngoing(!isPaused)
.setContentIntent(pIntent);

builder.addAction(R.drawable.ic_launcher_foreground, context.getString(R.string.noti_action_stop),
getPendingIntent(context, ACTION_STOP)).setContentIntent(pIntent);
getPendingIntent(context, ACTION_STOP)).setContentIntent(pIntent);

notifManager.notify(NOTIFICATION_ID, builder.build());
}
Expand All @@ -110,6 +111,6 @@ public void onReceive(Context context, Intent intent) {
cancelNotification(context);
context.sendBroadcast(new Intent(MainActivity.ACTION_STATE_CHANGED));
}
context.sendBroadcast(new Intent(QuickSettingsService.ACTION_UPDATE_TITLE));
context.sendBroadcast(new Intent(QuickSettingsTileService.ACTION_UPDATE_TITLE));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
import android.graphics.Paint;

public class TypefaceSpan extends MetricAffectingSpan {

private static LruCache<String, Typeface> sTypefaceCache = new LruCache<String, Typeface>(12);

private Typeface mTypeface;

public TypefaceSpan(Context context, String typefaceName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,9 @@ public void onAccessibilityEvent(AccessibilityEvent event) {
WindowUtil.show(this, act2, act1);
}
}

@Override
public void onInterrupt() {
sInstance = null;
}

@Override
Expand All @@ -87,7 +86,7 @@ public boolean onUnbind(Intent intent) {
sInstance = null;
WindowUtil.dismiss(this);
NotificationMonitor.cancelNotification(this);
sendBroadcast(new Intent(QuickSettingsService.ACTION_UPDATE_TITLE));
sendBroadcast(new Intent(QuickSettingsTileService.ACTION_UPDATE_TITLE));
return super.onUnbind(intent);
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,44 @@
/**
* Created by Ratul on 04/05/2022.
*/
@TargetApi(Build.VERSION_CODES.O)
@TargetApi(Build.VERSION_CODES.O)
public class BackgroundActivity extends AppCompatActivity {
public static String STRING_COPY = "io.github.ratul.topactivity.COPY_STRING";
public static String COPY_MSG = "io.github.ratul.topactivity.COPY_STRING_MSG";
public static boolean isAlive;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (!getIntent().hasExtra(STRING_COPY))
finish();
String str = getIntent().getStringExtra(STRING_COPY);
String msg = getIntent().getStringExtra(STRING_COPY);
String msg = getIntent().getStringExtra(COPY_MSG);
msg = (msg == null || msg.trim().isEmpty()) ? "Copied" : msg;

if (str != null) {
ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
ClipData clip = new ClipData(ClipData.newPlainText("", str));
clipboard.setPrimaryClip(clip);
App.showToast(msg, 0);
}
finish();
finish();
}

@Override
protected void onStop() {
isAlive = false;
super.onStop();
}

@Override
protected void onDestroy() {
isAlive = false;
super.onDestroy();
}

@Override
protected void onStart() {
isAlive = true;
super.onStart();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import com.google.android.material.textview.MaterialTextView;
import io.github.ratul.topactivity.ui.MainActivity;
import io.github.ratul.topactivity.ui.BackgroundActivity;
import io.github.ratul.topactivity.service.QuickSettingsService;
import io.github.ratul.topactivity.service.QuickSettingsTileService;
import io.github.ratul.topactivity.service.MonitoringService;
import io.github.ratul.topactivity.service.AccessibilityMonitoringService;
import android.content.pm.PackageInfo;
Expand Down Expand Up @@ -183,7 +183,7 @@ public static void show(Context context, String pkg, String clas) {
NotificationMonitor.builder.build());
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
QuickSettingsService.updateTile(context);
QuickSettingsTileService.updateTile(context);
}
}

Expand All @@ -195,7 +195,7 @@ public static void dismiss(Context context) {
e.printStackTrace();
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
QuickSettingsService.updateTile(context);
QuickSettingsTileService.updateTile(context);
}
}
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.2'
classpath 'com.android.tools.build:gradle:7.2.1'
}
}

Expand Down
Loading