Uninstalling before installing to guarantee changes updates

Author: lmbelo

source/services/Services.ADB.pas

@@ -17,6 +17,7 @@   TADBService = class(TInterfacedObject, IADBServices)
   public
     procedure ListDevices(const AAdbPath: string; const AStrings: TStrings);
     function InstallApk(const AAdbPath, AApkPath, ADevice: string; const AResult: TStrings): boolean;
+    function UnInstallApk(const AAdbPath, APkgName, ADevice: string; const AResult: TStrings): boolean;
     procedure RunApp(const AAdbPath, APkgName, ADevice: string; const AResult: TStrings);
 
     function BuildApk(const AAppBasePath, AAppName: string;
@@ -237,7 +238,20 @@ function TADBService.InstallApk(const AAdbPath, AApkPath, ADevice: string; const
 begin
   var LStrings := TStringList.Create();
   try
-    ExecCmd(AAdbPath + Format(' -s %s install -r ', [ADevice]) + AApkPath, String.Empty, LStrings);
+    ExecCmd(AAdbPath + Format(' -s %s install ', [ADevice]) + AApkPath, String.Empty, LStrings);
+    AResult.AddStrings(LStrings);
+    Result := (not LStrings.Text.Contains('failure')) and (not LStrings.Text.Contains('failed'));
+  finally
+    LStrings.Free();
+  end;
+end;
+
+function TADBService.UnInstallApk(const AAdbPath, APkgName, ADevice: string;
+  const AResult: TStrings): boolean;
+begin
+  var LStrings := TStringList.Create();
+  try
+    ExecCmd(AAdbPath + Format(' -s %s uninstall ', [ADevice]) + APkgName, String.Empty, LStrings);
     AResult.AddStrings(LStrings);
     Result := (not LStrings.Text.Contains('failure')) and (not LStrings.Text.Contains('failed'));
   finally

source/services/Services.App.pas

@@ -32,6 +32,8 @@   TAppService = class(TInterfacedObject, IAppServices)
       const AEnvironmentModel: TEnvironmentModel): boolean;
     function InstallApk(const AProjectModel: TProjectModel;
       const AEnvironmentModel: TEnvironmentModel; const ADevice: string): boolean;
+    function UnInstallApk(const AProjectModel: TProjectModel;
+      const AEnvironmentModel: TEnvironmentModel; const ADevice: string): boolean;
   end;
 
 implementation
@@ -157,6 +159,19 @@ function TAppService.InstallApk(const AProjectModel: TProjectModel;
   end;
 end;
 
+function TAppService.UnInstallApk(const AProjectModel: TProjectModel;
+  const AEnvironmentModel: TEnvironmentModel; const ADevice: string): boolean;
+begin
+  var LService := TServiceSimpleFactory.CreateAdb();
+  var LStrings := TStringList.Create();
+  try
+    Result := LService.UnInstallApk(AEnvironmentModel.AdbLocation,
+      AProjectModel.PackageName, ADevice, LStrings);
+  finally
+    LStrings.Free();
+  end;
+end;
+
 procedure TAppService.UpdateManifest(const AModel: TProjectModel);
 begin
   var LManifestPath := GetManifestPath(AModel.ApplicationName);

source/services/Services.pas

@@ -23,6 +23,8 @@ interface
       const AEnvironmentModel: TEnvironmentModel; const AResult: TStrings): boolean;
     function InstallApk(const AAdbPath, AApkPath, ADevice: string;
       const AResult: TStrings): boolean;
+    function UnInstallApk(const AAdbPath, APkgName, ADevice: string;
+      const AResult: TStrings): boolean;
     procedure RunApp(const AAdbPath, APkgName, ADevice: string; const AResult: TStrings);
   end;
 
@@ -34,6 +36,8 @@ interface
       const AEnvironmentModel: TEnvironmentModel): boolean;
     function InstallApk(const AProjectModel: TProjectModel;
       const AEnvironmentModel: TEnvironmentModel; const ADevice: string): boolean;
+    function UnInstallApk(const AProjectModel: TProjectModel;
+      const AEnvironmentModel: TEnvironmentModel; const ADevice: string): boolean;
     procedure AddScriptFile(const AModel: TProjectModel; const AFileName: string;
       const AStream: TStream);
   end;

source/views/Form.Main.pas

@@ -144,6 +144,7 @@ procedure TMainForm.DoDeploy;
         //Create and sign the APK file
         if BuildApk() then begin
           //Install the APK on the device
+          LAppService.UnInstallApk(FProjectModel, FEnvironmentModel, FDevices.Names[cbDevice.ItemIndex]);
           if LAppService.InstallApk(FProjectModel, FEnvironmentModel, FDevices.Names[cbDevice.ItemIndex]) then begin
             var LAdbService := TServiceSimpleFactory.CreateAdb();
             var LResult := TStringList.Create();