Merge pull request #2767 from TeamAmaze/emmanuelmess/fix/removestudio

Remove studio mode

app/src/main/java/com/amaze/filemanager/filesystem/files/FileUtils.java

@@ -50,7 +50,6 @@ import com.amaze.filemanager.ui.dialogs.GeneralDialogCreation;
 import com.amaze.filemanager.ui.dialogs.OpenFileDialogFragment;
 import com.amaze.filemanager.ui.dialogs.share.ShareTask;
 import com.amaze.filemanager.ui.fragments.preference_fragments.PreferencesConstants;
-import com.amaze.filemanager.ui.icons.Icons;
 import com.amaze.filemanager.ui.icons.MimeTypes;
 import com.amaze.filemanager.ui.theme.AppTheme;
 import com.amaze.filemanager.utils.DataUtils;
@@ -75,7 +74,6 @@ import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.os.CountDownTimer;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
@@ -85,7 +83,6 @@ import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 import androidx.core.util.Pair;
 import androidx.documentfile.provider.DocumentFile;
-import androidx.preference.PreferenceManager;
 
 import jcifs.smb.SmbFile;
 import net.schmizz.sshj.sftp.RemoteResourceInfo;
@@ -664,8 +661,6 @@ public class FileUtils {
     boolean useNewStack =
         sharedPrefs.getBoolean(PreferencesConstants.PREFERENCE_TEXTEDITOR_NEWSTACK, false);
     boolean defaultHandler = isSelfDefault(f, m);
-    final Toast[] studioCount = {null};
-    final int studio_count = PreferenceManager.getDefaultSharedPreferences(m).getInt("studio", 0);
 
     if (f.getName().toLowerCase().endsWith(".apk")) {
       GeneralDialogCreation.showPackageDialog(f, m);
@@ -675,26 +670,6 @@ public class FileUtils {
       Intent intent = new Intent(m, DatabaseViewerActivity.class);
       intent.putExtra("path", f.getPath());
       m.startActivity(intent);
-    } else if (Icons.getTypeOfFile(f.getPath(), f.isDirectory()) == Icons.AUDIO
-        && studio_count != 0) {
-      // Behold! It's the  legendary easter egg!
-      new CountDownTimer(studio_count, 1000) {
-        @Override
-        public void onTick(long millisUntilFinished) {
-          int sec = (int) millisUntilFinished / 1000;
-          if (studioCount[0] != null) studioCount[0].cancel();
-          studioCount[0] = Toast.makeText(m, sec + "", Toast.LENGTH_LONG);
-          studioCount[0].show();
-        }
-
-        @Override
-        public void onFinish() {
-          if (studioCount[0] != null) studioCount[0].cancel();
-          studioCount[0] = Toast.makeText(m, m.getString(R.string.opening), Toast.LENGTH_LONG);
-          studioCount[0].show();
-          openFileDialogFragmentFor(f, m, "audio/*");
-        }
-      }.start();
     } else {
       try {
         openFileDialogFragmentFor(f, m);

app/src/main/java/com/amaze/filemanager/ui/activities/AboutActivity.java

@@ -30,11 +30,9 @@ import com.amaze.filemanager.utils.Billing;
 import com.amaze.filemanager.utils.Utils;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.appbar.CollapsingToolbarLayout;
-import com.google.android.material.snackbar.Snackbar;
 import com.mikepenz.aboutlibraries.Libs;
 import com.mikepenz.aboutlibraries.LibsBuilder;
 
-import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Build;
@@ -48,7 +46,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.palette.graphics.Palette;
-import androidx.preference.PreferenceManager;
 
 /** Created by vishal on 27/7/16. */
 public class AboutActivity extends BasicActivity implements View.OnClickListener {
@@ -61,13 +58,9 @@ public class AboutActivity extends BasicActivity implements View.OnClickListener
   private AppBarLayout mAppBarLayout;
   private CollapsingToolbarLayout mCollapsingToolbarLayout;
   private TextView mTitleTextView;
-  private int mCount = 0;
-  private Snackbar snackbar;
-  private SharedPreferences mSharedPref;
   private View mAuthorsDivider, mDeveloper1Divider;
   private Billing billing;
 
-  private static final String KEY_PREF_STUDIO = "studio";
   private static final String URL_AUTHOR1_GITHUB = "https://github.com/arpitkh96";
   private static final String URL_AUTHOR2_GITHUB = "https://github.com/VishalNehra";
   private static final String URL_DEVELOPER1_GITHUB = "https://github.com/EmmanuelMess";
@@ -97,8 +90,6 @@ public class AboutActivity extends BasicActivity implements View.OnClickListener
 
     setContentView(R.layout.activity_about);
 
-    mSharedPref = PreferenceManager.getDefaultSharedPreferences(this);
-
     mAppBarLayout = findViewById(R.id.appBarLayout);
     mCollapsingToolbarLayout = findViewById(R.id.collapsing_toolbar_layout);
     mTitleTextView = findViewById(R.id.text_view_title);
@@ -189,27 +180,6 @@ public class AboutActivity extends BasicActivity implements View.OnClickListener
   @Override
   public void onClick(View v) {
     switch (v.getId()) {
-      case R.id.relative_layout_version:
-        mCount++;
-        if (mCount >= 5) {
-          String text = getResources().getString(R.string.easter_egg_title) + " : " + mCount;
-
-          if (snackbar != null && snackbar.isShown()) {
-            snackbar.setText(text);
-          } else {
-            snackbar = Snackbar.make(v, text, Snackbar.LENGTH_SHORT);
-          }
-
-          snackbar.show();
-          mSharedPref
-              .edit()
-              .putInt(KEY_PREF_STUDIO, Integer.parseInt(Integer.toString(mCount) + "000"))
-              .apply();
-        } else {
-          mSharedPref.edit().putInt(KEY_PREF_STUDIO, 0).apply();
-        }
-        break;
-
       case R.id.relative_layout_source:
         openURL(URL_REPO, this);
         break;

app/src/main/java/com/amaze/filemanager/ui/dialogs/RenameBookmark.java

@@ -20,12 +20,6 @@
 
 package com.amaze.filemanager.ui.dialogs;
 
-import static com.amaze.filemanager.filesystem.smb.CifsContexts.SMB_URI_PREFIX;
-
-import java.net.URL;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.amaze.filemanager.R;
@@ -45,16 +39,12 @@ import android.view.View;
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.preference.PreferenceManager;
 
-/** Created by arpitkh996 on 21-01-2016. */
 public class RenameBookmark extends DialogFragment {
 
   private String title;
   private String path;
-  private String user = "";
-  private String pass = "";
   private BookmarkCallback bookmarkCallback;
-  private int studiomode = 0;
-  private DataUtils dataUtils = DataUtils.getInstance();
+  private final DataUtils dataUtils = DataUtils.getInstance();
 
   public static RenameBookmark getInstance(String name, String path, int accentColor) {
     RenameBookmark renameBookmark = new RenameBookmark();
@@ -82,7 +72,6 @@ public class RenameBookmark extends DialogFragment {
     int accentColor = getArguments().getInt("accentColor");
     SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(c);
 
-    studiomode = sp.getInt("studio", 0);
     if (dataUtils.containsBooks(new String[] {title, path}) != -1) {
       final MaterialDialog materialDialog;
       String pa = path;
@@ -113,31 +102,7 @@ public class RenameBookmark extends DialogFragment {
             }
           });
       final AppCompatEditText ip = v2.findViewById(R.id.editText);
-      if (studiomode != 0) {
-        if (path.startsWith(SMB_URI_PREFIX)) {
-          try {
-            URL a = new URL(path);
-            String userinfo = a.getUserInfo();
-            if (userinfo != null) {
-              String inf = URLDecoder.decode(userinfo, "UTF-8");
-              user = inf.substring(0, inf.indexOf(":"));
-              pass = inf.substring(inf.indexOf(":") + 1, inf.length());
-              String ipp = a.getHost();
-              pa = SMB_URI_PREFIX + ipp + a.getPath();
-            }
-          } catch (Exception e) {
-            e.printStackTrace();
-          }
-        }
-        ip.addTextChangedListener(
-            new SimpleTextWatcher() {
-              @Override
-              public void afterTextChanged(Editable s) {
-                if (ip.getText().toString().length() == 0) t2.setError(s1);
-                else t2.setError("");
-              }
-            });
-      } else t2.setVisibility(View.GONE);
+      t2.setVisibility(View.GONE);
       ip.setText(pa);
       builder.onNeutral((dialog, which) -> dialog.dismiss());
 
@@ -148,24 +113,6 @@ public class RenameBookmark extends DialogFragment {
               v -> {
                 String t = ip.getText().toString();
                 String name = conName.getText().toString();
-                if (studiomode != 0 && t.startsWith(SMB_URI_PREFIX)) {
-                  try {
-                    URL a = new URL(t);
-                    String userinfo = a.getUserInfo();
-                    if (userinfo == null && user.length() > 0) {
-                      t =
-                          SMB_URI_PREFIX
-                              + ((URLEncoder.encode(user, "UTF-8")
-                                  + ":"
-                                  + URLEncoder.encode(pass, "UTF-8")
-                                  + "@"))
-                              + a.getHost()
-                              + a.getPath();
-                    }
-                  } catch (Exception e) {
-                    e.printStackTrace();
-                  }
-                }
                 int i = -1;
                 if ((i = dataUtils.containsBooks(new String[] {title, path})) != -1) {
                   if (!t.equals(title) && t.length() >= 1) {

app/src/main/res/layout/activity_about.xml

@@ -88,7 +88,6 @@
                         android:layout_height="@dimen/material_generic_list_item"
                         android:background="?android:attr/selectableItemBackground"
                         android:gravity="center_vertical"
-                        android:onClick="onClick"
                         android:nextFocusUp="@id/appBarLayout"
                         >
                         <ImageView

app/src/main/res/values/strings.xml

@@ -315,7 +315,6 @@
     <string name="report_bugs_summary">Report bugs or request new feature</string>
     <string name="translate_title">Translate</string>
     <string name="translate_summary">Translate Amaze in your language</string>
-    <string name="easter_egg_title">Studio Mode</string>
     <string name="paypal_copy_message">PayPal ID copied to clipboard</string>
     <string name="searching_devices">Searching for devices</string>
     <string name="use_custom_ip">Use custom IP</string>
@@ -374,7 +373,6 @@
     </string>
     <string name="share_limit">Can\'t share more than 100 files</string>
     <string name="otg_access">Select the root of OTG device</string>
-    <string name="opening">Opening..</string>
     <string name="information">Information</string>
     <!-- reference to file accessed date -->
     <string name="accessed">Accessed</string>