Redesign the app (un)install receiver

android/build.gradle

@@ -5,23 +5,23 @@ apply plugin: 'com.github.ben-manes.versions'
 apply plugin: 'kotlin-android'
 
 repositories {
-    jcenter()
     maven { url 'https://jitpack.io' }
     maven { url 'https://maven.google.com' }
+    maven { url "https://plugins.gradle.org/m2/" }
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "25.0.3"
+    namespace 'org.ligi.fast'
+    compileSdkVersion 33
 
     defaultConfig {
         versionCode 68
         versionName "6.8"
         // this can be 5 but for assertj this fails - only a problem for tests
         // http://stackoverflow.com/questions/25753751/increase-minsdk-for-androidtest
         minSdkVersion 9
-        targetSdkVersion 26
-        applicationId "org.ligi.fast"
+        targetSdkVersion 32
+        applicationId "org.ligi"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         archivesBaseName = "Fast-$versionName"
     }
@@ -32,6 +32,9 @@ android {
             shrinkResources true
             proguardFile 'proguard-project.txt'
         }
+        debug {
+            applicationIdSuffix '.debug'
+        }
     }
 
     flavorDimensions "market", "size"
@@ -51,12 +54,12 @@ android {
 
         withExtras {
             dimension "size"
-            applicationId "org.ligi.fast"
+            applicationIdSuffix ".fast"
         }
 
         noExtras {
             dimension "size"
-            applicationId "org.ligi.faster"
+            applicationIdSuffix ".faster"
         }
     }
 
@@ -66,43 +69,40 @@ android {
         variant.setIgnore(project.hasProperty("singleFlavor") && ((market != 'forGooglePlay') || (size != 'noExtras')))
     }
 
-    // ugly but the best workaround I found for getting the permission for spoon screenshot writing to SD-Card
-    // http://stackoverflow.com/questions/25276537/how-do-i-change-android-permission-settings-when-running-tests
-    sourceSets {
-        debug {
-            manifest.srcFile 'src/androidTest/AndroidManifest.xml'
-        }
-    }
-
-    lintOptions {
-        disable "MissingTranslation"
-        disable "TypographyEllipsis"
-        disable "IconLocation"
-        disable "IconDensities"
-        disable "ContentDescription"
+    lint {
+        disable 'MissingTranslation', 'TypographyEllipsis', 'IconLocation', 'IconDensities', 'ContentDescription'
     }
 
     // needed for assertJ
     packagingOptions {
-        exclude 'asm-license.txt'
-        exclude 'LICENSE'
-        exclude 'NOTICE'
+        resources {
+            excludes += ['asm-license.txt', 'LICENSE', 'NOTICE']
+        }
     }
 }
 
 dependencies {
-    compile 'com.github.ligi:tracedroid:1.4'
-
-    androidTestCompile 'com.github.ligi:trulesk:0.21'
-    androidTestCompile 'com.android.support:support-annotations:26.0.2'
-    androidTestCompile 'com.squareup.spoon:spoon-client:1.7.1'
-    androidTestCompile 'com.squareup.assertj:assertj-android:1.2.0'
-
-    testCompile 'com.squareup.assertj:assertj-android:1.2.0'
-    testCompile 'junit:junit:4.12'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    //TODO update raises minSdkLevel
+    implementation 'com.github.ligi:tracedroid:1.4'
+
+    //TODO update raises minSdkLevel and requires AndroidX
+    androidTestImplementation 'com.github.ligi:trulesk:0.21'
+    //TODO deprecated?
+    androidTestImplementation 'com.android.support:support-annotations:28.0.0'
+    //TODO deprecated?
+    androidTestImplementation 'com.squareup.spoon:spoon-client:1.7.1'
+    //TODO deprecated
+    androidTestImplementation 'com.squareup.assertj:assertj-android:1.2.0'
+
+    //TODO deprecated
+    testImplementation 'com.squareup.assertj:assertj-android:1.2.0'
+    //TODO migrate to v5
+    testImplementation 'junit:junit:4.13.2'
 }
 
 spoon {
     debug = true
     grantAllPermissions = true
-}
+}

android/src/androidTest/java/org/ligi/fast/testing/AndroidTestMutableFastSettings.java

@@ -11,6 +11,7 @@ public class AndroidTestMutableFastSettings implements FASTSettings {
     public boolean ignoreSpace = false;
     public boolean gapSearch = false;
     public String theme = "light";
+    public String lastIconShape = "";
 
     @Override
     public boolean isLaunchSingleActivated() {
@@ -87,4 +88,14 @@ public int getIconResolution() {
     public boolean isShowHiddenActivated() {
         return false;
     }
+
+    @Override
+    public String getLastIconShape() {
+        return lastIconShape;
+    }
+
+    @Override
+    public void putLastIconShape(String v) {
+        lastIconShape = v;
+    }
 }

android/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">FAST (Debug)</string>
+</resources>

android/src/forAmazon/java/org/ligi/fast/TargetStore.java

@@ -1,7 +1,7 @@
 package org.ligi.fast;
 
 public class TargetStore {
-    public final static String STORE_URL = "http://www.amazon.com/gp/mas/dl/android?p=";
+    public final static String STORE_URL = "https://www.amazon.com/gp/mas/dl/android?p=";
     public final static String STORE_NAME = "Amazon Store";
     public final static String STORE_PNAME = "com.amazon.venezia";
 }

android/src/forFDroid/java/fast/TargetStore.java → android/src/forFDroid/java/org/ligi/fast/TargetStore.java

@@ -1,7 +1,7 @@
 package org.ligi.fast;
 
 public class TargetStore {
-    public final static String STORE_URL = "http://play.google.com/store/apps/details?id=";
+    public final static String STORE_URL = "https://play.google.com/store/apps/details?id=";
     public final static String STORE_NAME = "Google Play";
     public final static String STORE_PNAME = "com.android.vending";
 }

android/src/forGooglePlay/java/org/ligi/fast/TargetStore.java

@@ -1,7 +1,7 @@
 package org.ligi.fast;
 
 public class TargetStore {
-    public final static String STORE_URL = "http://play.google.com/store/apps/details?id=";
+    public final static String STORE_URL = "https://play.google.com/store/apps/details?id=";
     public final static String STORE_NAME = "Google Play";
     public final static String STORE_PNAME = "com.android.vending";
 }

android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.ligi.fast">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--
     from experiments with shortcut - but dropped this feature for the feature of no needed permission
@@ -8,6 +7,19 @@
 
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
     -->
+    <!-- Required when targeting api 28 or above -->
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <!-- Required when targeting api 30 or above -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.HOME" />
+        </intent>
+    </queries>
 
     <supports-screens
         android:anyDensity="true"
@@ -31,13 +43,14 @@
         <activity android:name=".ui.FASTSettingsActivity" />
         <activity
             android:name=".ui.LoadingDialog"
+            android:configChanges="orientation"
             android:theme="@style/DialogTheme" />
         <activity
             android:name=".ui.SearchActivity"
+            android:exported="true"
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:stateNotNeeded="true"
-            android:excludeFromRecents="true"
             android:configChanges="orientation">
 
             <meta-data
@@ -67,18 +80,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-        <receiver android:name=".background.AppInstallOrRemoveReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_INSTALL" />
-                <action android:name="android.intent.action.PACKAGE_ADDED" />
-                <action android:name="android.intent.action.PACKAGE_REMOVED" />
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-                <action android:name="android.intent.action.PACKAGE_CHANGED" />
-                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
     </application>
 
 </manifest>

android/src/main/java/org/ligi/axt/helpers/ViewHelper.java

@@ -2,7 +2,6 @@
 
 
 import android.content.Context;
-import android.content.Intent;
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -15,19 +14,6 @@ public ViewHelper(View view) {
         this.view = view;
     }
 
-    public <T extends View> T findById(int id) {
-        return (T) view.findViewById(id);
-    }
-
-    public void hideKeyBoard() {
-        InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-        if (imm != null) {
-            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
-        } else {
-            Log.w("AndroidHelper", "could not hide Keyboard as INPUT_METHOD_SERVICE is not available");
-        }
-    }
-
     public void showKeyboard() {
         InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
         if (imm != null) {
@@ -36,15 +22,4 @@ public void showKeyboard() {
             Log.w("AndroidHelper", "could not show Keyboard as INPUT_METHOD_SERVICE is not available");
         }
     }
-
-    public void startIntentOnClick(final Intent intent) {
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                v.getContext().startActivity(intent);
-            }
-        });
-    }
-
-
 }