Min SDK

android_commons.gradle

@@ -9,7 +9,7 @@ android {
     buildToolsVersion '21.1.2'
 
     defaultConfig {
-        minSdkVersion 10
+        minSdkVersion 14
         targetSdkVersion 21
     }
 

app/build.gradle

@@ -11,7 +11,6 @@ apt {
 
 dependencies {
     compile project(':libraries:aFileChooser')
-    compile project(':libraries:Preferencefragment')
     compile project(':libraries:payme')
 
 

app/src/main/java/com/doplgangr/secrecy/premium/PremiumFragment.java

@@ -16,9 +16,9 @@
 package com.doplgangr.secrecy.premium;
 
 import android.app.AlertDialog;
+import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
 import android.view.LayoutInflater;

app/src/main/java/com/doplgangr/secrecy/settings/SettingsFragment.java

@@ -32,10 +32,10 @@
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
+import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceManager;
 import android.support.v4.content.IntentCompat;
-import android.support.v4.preference.PreferenceFragment;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -48,12 +48,12 @@
 
 import com.doplgangr.secrecy.Config;
 import com.doplgangr.secrecy.CustomApp;
+import com.doplgangr.secrecy.R;
+import com.doplgangr.secrecy.Util;
 import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.premium.PremiumFragment;
 import com.doplgangr.secrecy.premium.PremiumStateHelper;
 import com.doplgangr.secrecy.premium.StealthMode;
-import com.doplgangr.secrecy.R;
-import com.doplgangr.secrecy.Util;
 import com.doplgangr.secrecy.views.VaultsListFragment;
 import com.ipaulpro.afilechooser.FileChooserActivity;
 import com.ipaulpro.afilechooser.utils.FileUtils;

app/src/main/java/com/doplgangr/secrecy/updatemanager/UpdateManager.java

@@ -20,6 +20,7 @@
 package com.doplgangr.secrecy.updatemanager;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
@@ -28,18 +29,17 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
 import com.doplgangr.secrecy.Config;
-import com.doplgangr.secrecy.filesystem.Base64Coder;
-import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.R;
 import com.doplgangr.secrecy.Util;
+import com.doplgangr.secrecy.filesystem.Base64Coder;
+import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.views.VaultsListFragment;
 
 import org.apache.commons.io.FileUtils;

app/src/main/java/com/doplgangr/secrecy/views/FileImportActivity.java

@@ -1,26 +1,26 @@
 package com.doplgangr.secrecy.views;
 
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.NotificationCompat;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
 import android.widget.Toast;
 
 import com.doplgangr.secrecy.CustomApp;
+import com.doplgangr.secrecy.R;
+import com.doplgangr.secrecy.Util;
 import com.doplgangr.secrecy.events.AddingFileDoneEvent;
 import com.doplgangr.secrecy.events.AddingFileEvent;
 import com.doplgangr.secrecy.filesystem.encryption.Vault;
 import com.doplgangr.secrecy.filesystem.encryption.VaultHolder;
 import com.doplgangr.secrecy.jobs.AddFileJob;
-import com.doplgangr.secrecy.R;
-import com.doplgangr.secrecy.Util;
 
 import java.util.ArrayList;
 
@@ -50,7 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setSupportActionBar(mToolbar);
         FileImportFragment fragment = new FileImportFragment();
-        FragmentManager fragmentManager = getSupportFragmentManager();
+        FragmentManager fragmentManager = getFragmentManager();
         fragmentManager.beginTransaction()
                 .replace(R.id.drawer_layout, fragment, "mainactivitycontent")   //Replace the whole drawer layout
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)

app/src/main/java/com/doplgangr/secrecy/views/FileViewer.java

@@ -19,14 +19,14 @@
 
 package com.doplgangr.secrecy.views;
 
+import android.app.Fragment;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v4.app.Fragment;
 import android.support.v7.app.ActionBarActivity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -36,15 +36,15 @@
 
 import com.doplgangr.secrecy.Config;
 import com.doplgangr.secrecy.CustomApp;
+import com.doplgangr.secrecy.R;
+import com.doplgangr.secrecy.Util;
 import com.doplgangr.secrecy.filesystem.CryptStateListener;
+import com.doplgangr.secrecy.filesystem.OurFileProvider;
+import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.filesystem.encryption.Vault;
 import com.doplgangr.secrecy.filesystem.files.EncryptedFile;
 import com.doplgangr.secrecy.filesystem.files.SecrecyFile;
-import com.doplgangr.secrecy.filesystem.OurFileProvider;
-import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.jobs.AddFileJob;
-import com.doplgangr.secrecy.R;
-import com.doplgangr.secrecy.Util;
 
 import java.io.File;
 import java.util.ArrayList;

app/src/main/java/com/doplgangr/secrecy/views/FilesActivity.java

@@ -1,19 +1,22 @@
 package com.doplgangr.secrecy.views;
 
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.WindowManager;
 
 import com.doplgangr.secrecy.Config;
-import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.R;
 
 import de.greenrobot.event.EventBus;
 
+//import android.support.v4.app.Fragment;
+//import android.support.v4.app.FragmentManager;
+//import android.support.v4.app.FragmentTransaction;
+
 public class FilesActivity extends ActionBarActivity
         implements
         VaultsListFragment.OnFragmentFinishListener {
@@ -33,7 +36,7 @@ protected void onCreate(Bundle savedInstanceState) {
         String password = extras.getString(Config.password_extra);
 
         overridePendingTransition(R.anim.slide_in_right, R.anim.fadeout);
-        fragmentManager = getSupportFragmentManager();
+        fragmentManager = getFragmentManager();
         if (fragmentManager.findFragmentByTag(FilesListFragment.class.getName()) == null) {
             FilesListFragment fragment = new FilesListFragment();
             Bundle bundle = new Bundle();

app/src/main/java/com/doplgangr/secrecy/views/MainActivity.java

@@ -20,6 +20,9 @@
 package com.doplgangr.secrecy.views;
 
 import android.app.AlertDialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -28,9 +31,6 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
@@ -85,7 +85,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         Storage.deleteTemp();                                           //Start clean
         VaultHolder.getInstance().clear();
-        fragmentManager = getSupportFragmentManager();
+        fragmentManager = getFragmentManager();
         switchFragment(0);
         setSupportActionBar(mToolbar);
         if (PreferenceManager.getDefaultSharedPreferences(context)
@@ -243,21 +243,20 @@ void addFragment(final Fragment fragment, int transition1, int transition2) {
             mNavigation.setSelectedItem(mFragmentNameList.indexOf(fragment.getClass()));
         }
         String tag = fragment.getClass().getName();
-        FragmentManager manager = getSupportFragmentManager();
-        if (manager.getBackStackEntryCount() >= 1) {
+        if (fragmentManager.getBackStackEntryCount() >= 1) {
 
-            String activeFragmentTag = getSupportFragmentManager()
-                    .getBackStackEntryAt(getSupportFragmentManager()
+            String activeFragmentTag = fragmentManager
+                    .getBackStackEntryAt(fragmentManager
                             .getBackStackEntryCount() - 1).getName();
-            Fragment activeFragment =  getSupportFragmentManager()
+            Fragment activeFragment =  fragmentManager
                     .findFragmentByTag(activeFragmentTag);
             // Don't switch fragment if already active
             if (activeFragment.getClass().equals(fragment.getClass())){
                 return;
             }
             //clear all except lowest
-            FragmentManager.BackStackEntry first = manager.getBackStackEntryAt(0);
-            manager.popBackStackImmediate(first.getId(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
+            FragmentManager.BackStackEntry first = fragmentManager.getBackStackEntryAt(0);
+            fragmentManager.popBackStackImmediate(first.getId(), FragmentManager.POP_BACK_STACK_INCLUSIVE);
         }
         FragmentTransaction transaction = fragmentManager.beginTransaction()
                 .setCustomAnimations(transition1, transition2)

app/src/main/java/com/doplgangr/secrecy/views/VaultsListFragment.java

@@ -21,6 +21,7 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Fragment;
 import android.app.NotificationManager;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -30,7 +31,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.NotificationCompat;
 import android.support.v7.app.ActionBarActivity;
 import android.text.InputType;
@@ -48,15 +48,15 @@
 import android.widget.ViewAnimator;
 
 import com.doplgangr.secrecy.CustomApp;
+import com.doplgangr.secrecy.R;
+import com.doplgangr.secrecy.Util;
 import com.doplgangr.secrecy.events.RestoreDoneEvent;
 import com.doplgangr.secrecy.events.RestoringFileEvent;
+import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.filesystem.encryption.Vault;
 import com.doplgangr.secrecy.filesystem.encryption.VaultHolder;
-import com.doplgangr.secrecy.filesystem.Storage;
 import com.doplgangr.secrecy.jobs.RestoreJob;
-import com.doplgangr.secrecy.R;
 import com.doplgangr.secrecy.settings.SettingsFragment;
-import com.doplgangr.secrecy.Util;
 import com.ipaulpro.afilechooser.FileChooserActivity;
 import com.ipaulpro.afilechooser.utils.FileUtils;