Merge pull request #534 from maks/533-gdpr-dialog

maks · web-flow · commit 2dea57fadc00 · 2020-03-11T12:21:24.000+11:00
gdpr dialog
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,8 +15,8 @@ android {
 
         vectorDrawables.useSupportLibrary = true
 
-        versionCode 218
-        versionName "1.5.8"
+        versionCode 219
+        versionName "1.5.9"
     }
 
     dataBinding {
diff --git a/app/src/debug/java/me/sheimi/sgit/MGitDebugApplication.java b/app/src/debug/java/me/sheimi/sgit/MGitDebugApplication.java
@@ -8,10 +8,10 @@
 
 /**
  * Provides debug-build specific Application.
- *
+ * <p>
  * To disable Stetho console logging change the setting in src/debug/res/values/bools.xml
  */
-public class MGitDebugApplication extends SGitApplication {
+public class MGitDebugApplication extends MGitApplication {
 
     private static final String LOGTAG = MGitDebugApplication.class.getSimpleName();
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:name=".SGitApplication"
+        android:name=".MGitApplication"
         android:allowBackup="true"
         android:largeHeap="true" 
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/manichord/mgit/clone/CloneViewModel.kt b/app/src/main/java/com/manichord/mgit/clone/CloneViewModel.kt
@@ -3,8 +3,8 @@ package com.manichord.mgit.clone
 import android.app.Application
 import android.arch.lifecycle.AndroidViewModel
 import android.arch.lifecycle.MutableLiveData
+import me.sheimi.sgit.MGitApplication
 import me.sheimi.sgit.R
-import me.sheimi.sgit.SGitApplication
 import me.sheimi.sgit.database.models.Repo
 import me.sheimi.sgit.repo.tasks.repo.CloneTask
 import me.sheimi.sgit.repo.tasks.repo.InitLocalTask
@@ -85,7 +85,7 @@ class CloneViewModel(application: Application) : AndroidViewModel(application) {
     private fun validateRemoteUrl(remoteUrl: String): Boolean {
         remoteUrlError.value = null
         if (remoteUrl.isBlank()) {
-            remoteUrlError.value = getApplication<SGitApplication>().getString(R.string.alert_remoteurl_required)
+            remoteUrlError.value = getApplication<MGitApplication>().getString(R.string.alert_remoteurl_required)
             return false
         }
         return true
@@ -94,18 +94,18 @@ class CloneViewModel(application: Application) : AndroidViewModel(application) {
     private fun validateLocalName(localName: String): Boolean {
         localRepoNameError.value = null
         if (localName.isBlank()) {
-           localRepoNameError.value = getApplication<SGitApplication>().getString((R.string.alert_localpath_required))
+           localRepoNameError.value = getApplication<MGitApplication>().getString((R.string.alert_localpath_required))
            return false
         }
         if (localName.contains("/")) {
-            localRepoNameError.value = getApplication<SGitApplication>().getString((R.string.alert_localpath_format))
+            localRepoNameError.value = getApplication<MGitApplication>().getString((R.string.alert_localpath_format))
             return false
         }
 
-        val prefsHelper = (getApplication<SGitApplication>()).prefenceHelper
+        val prefsHelper = (getApplication<MGitApplication>()).prefenceHelper
         val file = Repo.getDir(prefsHelper, localName)
         if (file.exists()) {
-            localRepoNameError.value = getApplication<SGitApplication>().getString((R.string.alert_localpath_repo_exists))
+            localRepoNameError.value = getApplication<MGitApplication>().getString((R.string.alert_localpath_repo_exists))
             return false
         }
         return true
diff --git a/app/src/main/java/com/manichord/mgit/repolist/RepoListActivity.java b/app/src/main/java/com/manichord/mgit/repolist/RepoListActivity.java
@@ -27,8 +27,8 @@
 import java.util.List;
 
 import me.sheimi.android.activities.SheimiFragmentActivity;
+import me.sheimi.sgit.MGitApplication;
 import me.sheimi.sgit.R;
-import me.sheimi.sgit.SGitApplication;
 import me.sheimi.sgit.activities.RepoDetailActivity;
 import me.sheimi.sgit.activities.UserSettingsActivity;
 import me.sheimi.sgit.activities.explorer.ExploreFileActivity;
@@ -62,6 +62,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         checkAndRequestRequiredPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE);
 
+        enforcePrivacy(this);
+
         RepoListViewModel viewModel = ViewModelProviders.of(this).get(RepoListViewModel.class);
         CloneViewModel cloneViewModel = ViewModelProviders.of(this).get(CloneViewModel.class);
 
@@ -121,7 +123,7 @@ public void onActionClick(String action) {
                     Intent intent = new Intent(mContext, RepoDetailActivity.class);
                     intent.putExtra(Repo.TAG, repositoriesWithSameRemote.get(0));
                     startActivity(intent);
-                } else if (Repo.getDir(((SGitApplication) getApplicationContext()).getPrefenceHelper(), repoName).exists()) {
+                } else if (Repo.getDir(((MGitApplication) getApplicationContext()).getPrefenceHelper(), repoName).exists()) {
                     // Repository with name end already exists, see https://github.com/maks/MGit/issues/289
                     cloneViewModel.setRemoteUrl(repoUrlBuilder.toString());
                     showCloneView();
diff --git a/app/src/main/java/me/sheimi/android/activities/SheimiFragmentActivity.java b/app/src/main/java/me/sheimi/android/activities/SheimiFragmentActivity.java
@@ -1,5 +1,6 @@
 package me.sheimi.android.activities;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -27,8 +28,10 @@
 import me.sheimi.android.avatar.AvatarDownloader;
 import me.sheimi.android.utils.BasicFunctions;
 import me.sheimi.android.utils.Profile;
+import me.sheimi.sgit.MGitApplication;
 import me.sheimi.sgit.R;
 import me.sheimi.sgit.dialogs.DummyDialogListener;
+import me.sheimi.sgit.preference.PreferenceHelper;
 
 public class SheimiFragmentActivity extends AppCompatActivity {
 
@@ -92,6 +95,28 @@ protected void checkAndRequestRequiredPermissions(String permission) {
         }
     }
 
+    protected void enforcePrivacy(final Activity activity) {
+        final PreferenceHelper prefHelper = ((MGitApplication)activity.getApplication()).getPrefenceHelper();
+        if (prefHelper.isPrivacyAccepted()) {
+            return;
+        }
+
+        showMessageDialog(R.string.dialog_privacy_title, getString(R.string.dialog_privacy_message),
+            R.string.dialog_privacy_ok_button, R.string.dialog_privacy_close_button,
+            new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    prefHelper.setPrivacyAccepted();
+                }
+            },
+            new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialogInterface, int i) {
+                    activity.finish();
+                }
+            });
+    }
+
     /* View Utils Start */
     public void showToastMessage(final String msg) {
         runOnUiThread(new Runnable() {
diff --git a/app/src/main/java/me/sheimi/android/utils/Profile.java b/app/src/main/java/me/sheimi/android/utils/Profile.java
@@ -3,10 +3,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.TypedArray;
-import android.util.Log;
 
 import me.sheimi.sgit.R;
-import me.sheimi.sgit.SGitApplication;
 import me.sheimi.sgit.database.models.Repo;
 
 /**
diff --git a/app/src/main/java/me/sheimi/sgit/MGitApplication.kt b/app/src/main/java/me/sheimi/sgit/MGitApplication.kt
@@ -0,0 +1,70 @@
+package me.sheimi.sgit
+
+import android.app.Application
+import android.content.Context
+import android.util.Log
+import com.manichord.mgit.transport.MGitHttpConnectionFactory
+import io.sentry.Sentry
+import io.sentry.android.AndroidSentryClientFactory
+import me.sheimi.android.utils.SecurePrefsException
+import me.sheimi.android.utils.SecurePrefsHelper
+import me.sheimi.sgit.preference.PreferenceHelper
+import org.eclipse.jgit.transport.CredentialsProvider
+import timber.log.Timber
+
+/**
+ * Custom Application Singleton
+ */
+open class MGitApplication : Application() {
+    var securePrefsHelper: SecurePrefsHelper? = null
+    var prefenceHelper: PreferenceHelper? = null
+
+
+    companion object {
+        private lateinit var mContext: Context
+        private lateinit var mCredentialsProvider: CredentialsProvider
+        val context: Context?
+            get() = mContext
+
+        @JvmStatic fun getContext(): MGitApplication {
+            return mContext as MGitApplication
+        }
+
+        @JvmStatic fun getJschCredentialsProvider(): CredentialsProvider {
+            return mCredentialsProvider
+        }
+
+        init {
+            MGitHttpConnectionFactory.install()
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        // only init Sentry if not debug build
+        if (!BuildConfig.DEBUG) {
+            Sentry.init(AndroidSentryClientFactory(this))
+            Log.d("SENTRY", "SENTRY Configured")
+        }
+        mContext = applicationContext
+        setAppVersionPref()
+        prefenceHelper = PreferenceHelper(this)
+        try {
+            securePrefsHelper = SecurePrefsHelper(this)
+            mCredentialsProvider = AndroidJschCredentialsProvider(securePrefsHelper)
+        } catch (e: SecurePrefsException) {
+            Timber.e(e)
+        }
+    }
+
+    private fun setAppVersionPref() {
+        val sharedPreference = getSharedPreferences(
+            getString(R.string.preference_file_key),
+            Context.MODE_PRIVATE)
+        val version = BuildConfig.VERSION_NAME
+        sharedPreference
+            .edit()
+            .putString(getString(R.string.preference_key_app_version), version)
+            .apply()
+    }
+}
diff --git a/app/src/main/java/me/sheimi/sgit/SGitApplication.java b/app/src/main/java/me/sheimi/sgit/SGitApplication.java
diff --git a/app/src/main/java/me/sheimi/sgit/activities/explorer/ExploreRootDirActivity.java b/app/src/main/java/me/sheimi/sgit/activities/explorer/ExploreRootDirActivity.java
@@ -10,9 +10,7 @@
 import java.io.FileFilter;
 
 import me.sheimi.sgit.R;
-import me.sheimi.sgit.SGitApplication;
 import me.sheimi.sgit.database.models.Repo;
-import me.sheimi.sgit.preference.PreferenceHelper;
 
 public class ExploreRootDirActivity extends FileExplorerActivity {
 
diff --git a/app/src/main/java/me/sheimi/sgit/database/models/Repo.java b/app/src/main/java/me/sheimi/sgit/database/models/Repo.java
@@ -29,7 +29,7 @@
 import java.util.Set;
 
 import me.sheimi.android.utils.FsUtils;
-import me.sheimi.sgit.SGitApplication;
+import me.sheimi.sgit.MGitApplication;
 import me.sheimi.sgit.database.RepoContract;
 import me.sheimi.sgit.database.RepoDbManager;
 import me.sheimi.sgit.exception.StopTaskException;
@@ -514,7 +514,7 @@ public static File getDir(PreferenceHelper preferenceHelper, String localpath) {
     }
 
     public static void setLocalRepoRoot(Context context, File repoRoot) {
-        PreferenceHelper prefs = ((SGitApplication) context.getApplicationContext()).getPrefenceHelper();
+        PreferenceHelper prefs = ((MGitApplication) context.getApplicationContext()).getPrefenceHelper();
         File oldRoot = prefs.getRepoRoot();
         prefs.setRepoRoot(repoRoot.getAbsolutePath());
 
@@ -529,7 +529,7 @@ public static void setLocalRepoRoot(Context context, File repoRoot) {
     }
 
     public File getDir() {
-        PreferenceHelper prefHelper = ((SGitApplication) SGitApplication.getContext()).getPrefenceHelper();
+        PreferenceHelper prefHelper = ((MGitApplication) MGitApplication.getContext()).getPrefenceHelper();
         return Repo.getDir(prefHelper, getLocalPath());
     }
 
diff --git a/app/src/main/java/me/sheimi/sgit/dialogs/EditKeyPasswordDialog.java b/app/src/main/java/me/sheimi/sgit/dialogs/EditKeyPasswordDialog.java
@@ -11,10 +11,9 @@
 import java.io.File;
 
 import me.sheimi.android.views.SheimiDialogFragment;
+import me.sheimi.sgit.MGitApplication;
 import me.sheimi.sgit.R;
-import me.sheimi.sgit.SGitApplication;
 import me.sheimi.sgit.activities.explorer.PrivateKeyManageActivity;
-import me.sheimi.sgit.ssh.PrivateKeyUtils;
 import timber.log.Timber;
 
 /**
@@ -76,7 +75,7 @@ public void onStart() {
     public void onClick(View view) {
         String newPassword = mPassword.getText().toString().trim();
         try {
-            ((SGitApplication)getActivity().getApplicationContext()).getSecurePrefsHelper().
+            ((MGitApplication)getActivity().getApplicationContext()).getSecurePrefsHelper().
                 set(mKeyFile.getName(), newPassword);
         } catch (Exception e) {
             Timber.e(e);
diff --git a/app/src/main/java/me/sheimi/sgit/dialogs/ImportLocalRepoDialog.java b/app/src/main/java/me/sheimi/sgit/dialogs/ImportLocalRepoDialog.java
@@ -15,8 +15,8 @@
 
 import me.sheimi.android.utils.FsUtils;
 import me.sheimi.android.views.SheimiDialogFragment;
+import me.sheimi.sgit.MGitApplication;
 import me.sheimi.sgit.R;
-import me.sheimi.sgit.SGitApplication;
 import me.sheimi.sgit.database.RepoContract;
 import me.sheimi.sgit.database.models.Repo;
 import me.sheimi.sgit.preference.PreferenceHelper;
@@ -42,7 +42,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
         mActivity = getActivity();
 
-        mPrefsHelper = ((SGitApplication)mActivity.getApplicationContext()).getPrefenceHelper();
+        mPrefsHelper = ((MGitApplication)mActivity.getApplicationContext()).getPrefenceHelper();
 
         Bundle args = getArguments();
         if (args != null && args.containsKey(FROM_PATH)) {
diff --git a/app/src/main/java/me/sheimi/sgit/dialogs/InitDialog.java b/app/src/main/java/me/sheimi/sgit/dialogs/InitDialog.java
diff --git a/app/src/main/java/me/sheimi/sgit/preference/PreferenceHelper.java b/app/src/main/java/me/sheimi/sgit/preference/PreferenceHelper.java
diff --git a/app/src/main/java/me/sheimi/sgit/repo/tasks/repo/CommitChangesTask.java b/app/src/main/java/me/sheimi/sgit/repo/tasks/repo/CommitChangesTask.java
diff --git a/app/src/main/java/me/sheimi/sgit/ssh/SGitSessionFactory.java b/app/src/main/java/me/sheimi/sgit/ssh/SGitSessionFactory.java
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ android {`
`15`	`15`
`16`	`16`	`vectorDrawables.useSupportLibrary = true`
`17`	`17`
`18`		`- versionCode 218`
`19`		`- versionName "1.5.8"`
	`18`	`+ versionCode 219`
	`19`	`+ versionName "1.5.9"`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`dataBinding {`