diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 80de00c..03d9c98 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,18 +1,6 @@ - - - - - - - - - - - - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b87c932..b2aeefa 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,6 +10,9 @@ + + + getArrayList(String key) { return appSharedPrefs.getStringSet(key, null); } diff --git a/app/src/main/java/com/app/simplitend/appblocking/TopAppDetectionService.java b/app/src/main/java/com/app/simplitend/appblocking/TopAppDetectionService.java index 54702ff..8e76cea 100644 --- a/app/src/main/java/com/app/simplitend/appblocking/TopAppDetectionService.java +++ b/app/src/main/java/com/app/simplitend/appblocking/TopAppDetectionService.java @@ -3,6 +3,7 @@ package com.app.simplitend.appblocking; import android.accessibilityservice.AccessibilityService; import android.accessibilityservice.AccessibilityServiceInfo; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.Build; import android.util.Log; import android.view.accessibility.AccessibilityEvent; @@ -44,8 +45,7 @@ public class TopAppDetectionService extends AccessibilityService { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); String appName; try { - String[] split_name = packageName.split("\\."); - appName = split_name[split_name.length-1].toUpperCase(); + appName = getPackageManager().getApplicationLabel(getPackageManager().getApplicationInfo(packageName, PackageManager.GET_META_DATA)).toString(); }catch (Exception e){ appName = "This app"; } diff --git a/app/src/main/java/com/app/simplitend/apputils/AppUtil.java b/app/src/main/java/com/app/simplitend/apputils/AppUtil.java index f093a80..c8b98ca 100644 --- a/app/src/main/java/com/app/simplitend/apputils/AppUtil.java +++ b/app/src/main/java/com/app/simplitend/apputils/AppUtil.java @@ -580,11 +580,7 @@ public abstract class AppUtil { // app block list clear MySharedPref mySharedPref = new MySharedPref(context); - Set appList = mySharedPref.getArrayList("APP_LIST"); - if (appList != null) { - appList.clear(); - mySharedPref.setArrayList("APP_LIST", appList); - } + mySharedPref.removeKey("APP_LIST"); // removing contact listing setWhiteListedContacts(context, null); diff --git a/app/src/main/res/layout/activity_personal_info.xml b/app/src/main/res/layout/activity_personal_info.xml index 117254a..9479201 100644 --- a/app/src/main/res/layout/activity_personal_info.xml +++ b/app/src/main/res/layout/activity_personal_info.xml @@ -88,7 +88,6 @@ android:inputType="textCapWords" android:maxLength="50" - android:digits="@string/allowed_alphabets_with_space" /> @@ -387,7 +386,7 @@ android:autofillHints="postalAddress" android:inputType="text|textCapSentences" - android:maxLength="50" + android:maxLength="255" /> @@ -244,7 +246,9 @@ android:inputType="text|textCapWords" android:maxLines="1" - android:maxLength="255" + android:maxLength="50" + android:digits="@string/allowed_alphanumeric_space_special" + android:singleLine="true" /> @@ -787,7 +789,7 @@ android:inputType="textCapSentences" android:maxHeight="150dp" - android:maxLength="60" + android:maxLength="255" android:overScrollMode="always" android:padding="10dp" @@ -800,6 +802,9 @@ android:textColor="@color/black" android:textColorHint="@android:color/darker_gray" + android:digits="@string/allowed_alphanumeric_space_special" + android:singleLine="true" + /> @@ -140,7 +143,8 @@ android:overScrollMode="never" android:scrollbars="vertical" - android:maxLength="60" + android:maxLength="255" + android:digits="@string/allowed_alphanumeric_space_special" /> 1234567890 Close Your subscription has been canceled. You will be able to use your application until the end of your current subscription. Your app will stop working at that point. + ,.?/]]> \ No newline at end of file