Skip to content

Commit e1bac17

Browse files
choiman1559choiman1559
committed
Fixed Switches on PairDetailActivity wont reflected on preferences
1 parent 27373ed commit e1bac17

File tree

9 files changed

+48
-50
lines changed

9 files changed

+48
-50
lines changed

‎.idea/appInsightsSettings.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/deploymentTargetSelector.xml‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
applicationId "com.noti.main"
2626
minSdkVersion 23
2727
targetSdkVersion 34
28-
versionCode 1012010
29-
versionName "1.21.0"
28+
versionCode 1012101
29+
versionName "1.21.1"
3030

3131
multiDexEnabled true
3232
ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
@@ -98,7 +98,7 @@ dependencies {
9898
implementation 'com.google.android.gms:play-services-maps:18.2.0'
9999
implementation 'com.google.auth:google-auth-library-oauth2-http:1.23.0'
100100

101-
implementation platform('com.google.firebase:firebase-bom:33.1.0')
101+
implementation platform('com.google.firebase:firebase-bom:33.1.1')
102102
implementation 'com.google.firebase:firebase-auth'
103103
implementation 'com.google.firebase:firebase-messaging'
104104
implementation 'com.google.firebase:firebase-analytics'
@@ -107,15 +107,15 @@ dependencies {
107107
implementation 'com.google.firebase:firebase-config'
108108
implementation 'com.google.firebase:firebase-storage'
109109

110-
implementation 'me.pushy:sdk:1.0.106'
111-
implementation "com.github.mvojtkovszky:BillingHelper:2.2.1"
110+
implementation 'me.pushy:sdk:1.0.110'
111+
implementation "com.github.mvojtkovszky:BillingHelper:3.0.0"
112112
implementation 'com.android.volley:volley:1.2.1'
113113
implementation 'com.github.bumptech.glide:glide:4.16.0'
114114
implementation 'com.github.isradeleon:Notify-Android:1.0.4'
115115
implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
116116
implementation 'com.joaomgcd:taskerpluginlibrary:0.4.10'
117-
implementation 'com.microsoft.design:fluent-system-icons:1.1.227@aar'
118-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22'
117+
implementation 'com.microsoft.design:fluent-system-icons:1.1.245@aar'
118+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.0'
119119
}
120120

121121
repositories {

‎app/src/main/java/com/noti/main/service/FirebaseMessageService.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,8 @@ public void processReception(Map<String, String> map, Context context) {
256256
}
257257
}
258258

259-
if (deviceDetailPrefs.getBoolean(map.get("device_id"), false)) {
259+
String[] deviceDetails = deviceDetailPrefs.getString(map.get("device_id"), "").split("\\|");
260+
if (deviceDetails.length > 0 && "true".equals(deviceDetails[0])) {
260261
return;
261262
}
262263

‎app/src/main/java/com/noti/main/service/NotiListenerService.java‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
import android.annotation.SuppressLint;
44
import android.app.Notification;
55
import android.content.Context;
6-
import android.content.Intent;
76
import android.content.SharedPreferences;
87
import android.content.pm.PackageManager;
9-
import android.content.pm.ResolveInfo;
108
import android.graphics.Bitmap;
119
import android.graphics.Canvas;
1210
import android.graphics.Matrix;
@@ -210,13 +208,7 @@ private void QueryGC() {
210208
}
211209

212210
private String getSystemDialerApp(Context context) {
213-
if (Build.VERSION.SDK_INT > 22) {
214-
return ((TelecomManager) context.getSystemService(Context.TELECOM_SERVICE)).getDefaultDialerPackage();
215-
} else {
216-
Intent dialerIntent = new Intent(Intent.ACTION_DIAL).addCategory(Intent.CATEGORY_DEFAULT);
217-
List<ResolveInfo> mResolveInfoList = context.getPackageManager().queryIntentActivities(dialerIntent, 0);
218-
return mResolveInfoList.get(0).activityInfo.packageName;
219-
}
211+
return ((TelecomManager) context.getSystemService(Context.TELECOM_SERVICE)).getDefaultDialerPackage();
220212
}
221213

222214
private boolean isTelephonyApp(Context context, String packageName) {
@@ -229,6 +221,11 @@ private boolean isTelephonyApp(Context context, String packageName) {
229221
}
230222
}
231223

224+
@Override
225+
public void onNotificationRemoved(StatusBarNotification sbn) {
226+
super.onNotificationRemoved(sbn);
227+
}
228+
232229
@Override
233230
public void onNotificationPosted(StatusBarNotification sbn) {
234231
super.onNotificationPosted(sbn);
@@ -251,7 +248,7 @@ public void onNotificationPosted(StatusBarNotification sbn) {
251248

252249
boolean isLogging = BuildConfig.DEBUG;
253250

254-
if (!prefs.getString("UID", "").equals("") && prefs.getBoolean("serviceToggle", false)) {
251+
if (!prefs.getString("UID", "").isEmpty() && prefs.getBoolean("serviceToggle", false)) {
255252
String mode = prefs.getString("service", "reception");
256253
if (mode.equals("send") || mode.equals("hybrid")) {
257254
String TITLE = getNonNullString(extra.getString(Notification.EXTRA_TITLE));
@@ -290,7 +287,7 @@ public void onNotificationPosted(StatusBarNotification sbn) {
290287
JSONObject object = new JSONObject();
291288
String originString = logPrefs.getString("sendLogs", "");
292289

293-
if (!originString.equals("")) array = new JSONArray(originString);
290+
if (!originString.isEmpty()) array = new JSONArray(originString);
294291
object.put("date", DATE);
295292
object.put("package", PackageName);
296293
object.put("title", extra.getString(Notification.EXTRA_TITLE));
@@ -382,25 +379,15 @@ private void sendNormalNotification(Notification notification, String PackageNam
382379
try {
383380
if (prefs.getBoolean("IconUseNotification", false)) {
384381
Context packageContext = createPackageContext(PackageName, CONTEXT_IGNORE_SECURITY);
385-
386-
if (Build.VERSION.SDK_INT > 22) {
387-
Icon LargeIcon = notification.getLargeIcon();
388-
Icon SmallIcon = notification.getSmallIcon();
389-
390-
if (LargeIcon != null)
391-
ICON = getBitmapFromDrawable(LargeIcon.loadDrawable(packageContext));
392-
else if (SmallIcon != null)
393-
ICON = getBitmapFromDrawable(SmallIcon.loadDrawable(packageContext));
394-
else
395-
ICON = getBitmapFromDrawable(pm.getApplicationIcon(PackageName));
396-
} else {
397-
Bitmap LargeIcon = notification.largeIcon;
398-
int SmallIcon = notification.icon;
399-
400-
if (LargeIcon != null) ICON = LargeIcon;
401-
else if (SmallIcon != 0)
402-
ICON = getBitmapFromDrawable(packageContext.getDrawable(SmallIcon));
403-
}
382+
Icon LargeIcon = notification.getLargeIcon();
383+
Icon SmallIcon = notification.getSmallIcon();
384+
385+
if (LargeIcon != null)
386+
ICON = getBitmapFromDrawable(LargeIcon.loadDrawable(packageContext));
387+
else if (SmallIcon != null)
388+
ICON = getBitmapFromDrawable(SmallIcon.loadDrawable(packageContext));
389+
else
390+
ICON = getBitmapFromDrawable(pm.getApplicationIcon(PackageName));
404391
} else {
405392
ICON = getBitmapFromDrawable(pm.getApplicationIcon(PackageName));
406393
}
@@ -459,7 +446,7 @@ else if (SmallIcon != 0)
459446
private boolean isBannedWords(String TEXT, String TITLE) {
460447
if (prefs.getBoolean("UseBannedOption", false)) {
461448
String word = prefs.getString("BannedWords", "");
462-
if (!word.equals("")) {
449+
if (!word.isEmpty()) {
463450
String[] words = word.split("/");
464451
for (String s : words) {
465452
if ((TEXT != null && TEXT.contains(s)) || (TITLE != null && TITLE.contains(s)))
@@ -668,7 +655,7 @@ protected static JSONObject encryptData(JSONObject data) throws Exception {
668655
String DEVICE_ID = getUniqueID();
669656
String HmacToken = HMACCrypto.generateTokenIdentifier(DEVICE_NAME, DEVICE_ID);
670657

671-
if ((useEncryption && !rawPassword.equals("")) || isAlwaysEncryptData) {
658+
if ((useEncryption && !rawPassword.isEmpty()) || isAlwaysEncryptData) {
672659
String uid = FirebaseAuth.getInstance().getUid();
673660
if (uid != null) {
674661
String finalPassword = AESCrypto.parseAESToken(useEncryption ? AESCrypto.decrypt(rawPassword, AESCrypto.parseAESToken(uid)) : Base64.encodeToString(prefs.getString("Email", "").getBytes(StandardCharsets.UTF_8), Base64.NO_WRAP));
@@ -716,7 +703,7 @@ protected static void finalProcessData(JSONObject notification, String PackageNa
716703
case "Firebase Cloud Message" ->
717704
sendFCMNotificationWrapper(finalObject, PackageName, context);
718705
case "Pushy" -> {
719-
if (!prefs.getString("ApiKey_Pushy", "").equals(""))
706+
if (!prefs.getString("ApiKey_Pushy", "").isEmpty())
720707
sendPushyNotification(finalObject, PackageName, context);
721708
}
722709
default -> {

‎app/src/main/java/com/noti/main/ui/pair/PairDetailActivity.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
8282
deviceBlackListLayout.setVisibility(isComputer ? View.GONE : View.VISIBLE);
8383

8484
batteryWarningReceive.setSwitchChecked(getDevicePrefsOrDefault(1));
85+
batteryWarningReceive.setOnClickListener((v) -> batteryWarningReceive.setSwitchChecked(!batteryWarningReceive.isChecked()));
8586
batteryWarningReceive.setOnCheckedChangedListener((buttonView, isChecked) -> setDeviceDetailPrefs(isChecked, 1));
8687

8788
remoteToggleLayout.setOnClickListener((v) -> {
@@ -206,7 +207,8 @@ void setDeviceDetailPrefs(boolean input, int index) {
206207
result.append(input).append("|");
207208
}
208209

209-
deviceDetailPrefs.edit().putString(Device_id, result.toString()).apply();
210+
String resultString = result.toString();
211+
deviceDetailPrefs.edit().putString(Device_id, resultString.substring(0, resultString.length() - 1)).apply();
210212
}
211213

212214
boolean getDevicePrefsOrDefault(int index) {
@@ -219,7 +221,7 @@ boolean getDevicePrefsOrDefault(int index) {
219221
}
220222

221223
boolean[] getDevicePrefsAsArray() {
222-
String[] list = prefs.getString(Device_id, "").split("\\|");
224+
String[] list = deviceDetailPrefs.getString(Device_id, "").split("\\|");
223225
boolean[] result = new boolean[list.length];
224226

225227
for(int i = 0; i < list.length; i++) {

‎app/src/main/java/com/noti/main/ui/pair/action/PairActionObj.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,13 @@ public PairActionObj(PairRemoteAction pairRemoteAction) {
4747
}
4848

4949
public static PairActionObj buildFrom(String rawJson) {
50-
return new Gson().fromJson(rawJson, PairActionObj.class);
50+
PairActionObj obj = new Gson().fromJson(rawJson, PairActionObj.class);
51+
52+
if (obj.targetDeviceTypeScope == null) {
53+
obj.targetDeviceTypeScope = new String[0];
54+
}
55+
56+
return obj;
5157
}
5258

5359
@Nullable

‎app/src/main/java/com/noti/main/utils/BillingHelper.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import com.noti.main.BuildConfig;
1616
import com.noti.main.R;
1717

18+
import com.vojtkovszky.billinghelper.BillingBuilderConfig;
1819
import com.vojtkovszky.billinghelper.BillingEvent;
1920
import com.vojtkovszky.billinghelper.BillingListener;
2021

@@ -75,6 +76,7 @@ public static BillingHelper initialize(Context mContext) {
7576
ImmutableList.of(DonateID),
7677
ImmutableList.of(SubscribeID),
7778
true, APIKey.isEmpty() ? null : APIKey,
79+
new BillingBuilderConfig(),
7880
true, true, true,
7981
BuildConfig.DEBUG, billingHelper
8082
);

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ buildscript {
1010
}
1111

1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:8.4.1'
14-
classpath 'com.google.gms:google-services:4.4.1'
15-
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
13+
classpath 'com.android.tools.build:gradle:8.5.0'
14+
classpath 'com.google.gms:google-services:4.4.2'
15+
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
1616
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
1717
// NOTE: Do not place your application dependencies here; they belong
1818
// in the individual module build.gradle files

0 commit comments

Comments
 (0)