Merge pull request #1440 from TranceLove/bugfix/issue1253

Check if screen is locked before processing tile's click event (#1253)
TeamAmaze · Sep 27, 2018 · f87fc2c · f87fc2c
1 parent fb4efaa
commit f87fc2c
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/services/ftp/FtpTileService.java b/app/src/main/java/com/amaze/filemanager/asynchronous/services/ftp/FtpTileService.java
@@ -46,21 +46,21 @@ public void onStopListening() {
 
     @Override
     public void onClick() {
-        super.onClick();
-
-        if (getQsTile().getState() == Tile.STATE_ACTIVE) {
-            getApplicationContext().sendBroadcast(new Intent(FtpService.ACTION_STOP_FTPSERVER).setPackage(getPackageName()));
-        } else {
-            if (FtpService.isConnectedToWifi(getApplicationContext())
-                    || FtpService.isConnectedToLocalNetwork(getApplicationContext())
-                    || FtpService.isEnabledWifiHotspot(getApplicationContext())) {
-                Intent i = new Intent(FtpService.ACTION_START_FTPSERVER).setPackage(getPackageName());
-                i.putExtra(FtpService.TAG_STARTED_BY_TILE, true);
-                getApplicationContext().sendBroadcast(i);
+        unlockAndRun(()->{
+            if (FtpService.isRunning()) {
+                getApplicationContext().sendBroadcast(new Intent(FtpService.ACTION_STOP_FTPSERVER).setPackage(getPackageName()));
             } else {
-                Toast.makeText(getApplicationContext(), getString(R.string.ftp_no_wifi), Toast.LENGTH_LONG).show();
+                if (FtpService.isConnectedToWifi(getApplicationContext())
+                        || FtpService.isConnectedToLocalNetwork(getApplicationContext())
+                        || FtpService.isEnabledWifiHotspot(getApplicationContext())) {
+                    Intent i = new Intent(FtpService.ACTION_START_FTPSERVER).setPackage(getPackageName());
+                    i.putExtra(FtpService.TAG_STARTED_BY_TILE, true);
+                    getApplicationContext().sendBroadcast(i);
+                } else {
+                    Toast.makeText(getApplicationContext(), getString(R.string.ftp_no_wifi), Toast.LENGTH_LONG).show();
+                }
             }
-        }
+        });
     }
 
     private void updateTileState() {