浏览代码

Move to proper folder structure

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 5 年之前
父节点
当前提交
dbc92cd326

+ 1 - 1
src/main/AndroidManifest.xml

@@ -320,7 +320,7 @@
 
         <activity android:name=".ui.activity.LogHistoryActivity"/>
 
-        <activity android:name=".ui.errorhandling.ShowErrorActivity"
+        <activity android:name="com.nextcloud.client.errorhandling.ShowErrorActivity"
             android:theme="@style/Theme.ownCloud.Toolbar"/>
         <activity android:name=".ui.activity.UploadListActivity" />
         <activity

+ 2 - 2
src/main/java/com/nextcloud/client/di/ComponentsModule.java

@@ -20,8 +20,9 @@
 
 package com.nextcloud.client.di;
 
-import com.nextcloud.client.onboarding.FirstRunActivity;
+import com.nextcloud.client.errorhandling.ShowErrorActivity;
 import com.nextcloud.client.etm.EtmActivity;
+import com.nextcloud.client.onboarding.FirstRunActivity;
 import com.nextcloud.client.onboarding.WhatsNewActivity;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.authentication.DeepLinkLoginActivity;
@@ -62,7 +63,6 @@ import com.owncloud.android.ui.activity.UploadListActivity;
 import com.owncloud.android.ui.activity.UploadPathActivity;
 import com.owncloud.android.ui.activity.UserInfoActivity;
 import com.owncloud.android.ui.dialog.ChooseTemplateDialogFragment;
-import com.owncloud.android.ui.errorhandling.ShowErrorActivity;
 import com.owncloud.android.ui.fragment.ExtendedListFragment;
 import com.owncloud.android.ui.fragment.FileDetailActivitiesFragment;
 import com.owncloud.android.ui.fragment.FileDetailFragment;

+ 8 - 3
src/main/java/com/owncloud/android/ui/errorhandling/ExceptionHandler.kt → src/main/java/com/nextcloud/client/errorhandling/ExceptionHandler.kt

@@ -1,8 +1,11 @@
 /*
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author LukeOwncloud
+ *   @author AndyScherzinger
  *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 LukeOwncloud
+ *   Copyright (C) 2019 Andy Scherzinger
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2,
@@ -16,7 +19,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.owncloud.android.ui.errorhandling
+package com.nextcloud.client.errorhandling
 
 import android.app.Activity
 import android.content.Intent
@@ -25,11 +28,13 @@ import android.util.Log
 
 import java.io.PrintWriter
 import java.io.StringWriter
+import kotlin.system.exitProcess
 
 class ExceptionHandler(private val context: Activity) : Thread.UncaughtExceptionHandler {
     companion object {
         private val TAG = ExceptionHandler::class.java.simpleName
         private val LINE_SEPARATOR = "\n"
+        private val STATUS = 1000
     }
 
     override fun uncaughtException(thread: Thread, exception: Throwable) {
@@ -46,7 +51,7 @@ class ExceptionHandler(private val context: Activity) : Thread.UncaughtException
         context.startActivity(intent)
 
         android.os.Process.killProcess(android.os.Process.myPid())
-        System.exit(1000)
+        exitProcess(STATUS)
     }
 
     private fun generateErrorReport(stackTrace: String): String {

+ 1 - 1
src/main/java/com/owncloud/android/ui/errorhandling/ShowErrorActivity.kt → src/main/java/com/nextcloud/client/errorhandling/ShowErrorActivity.kt

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.owncloud.android.ui.errorhandling
+package com.nextcloud.client.errorhandling
 
 import android.content.Intent
 import android.net.Uri

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/BaseActivity.java

@@ -11,12 +11,12 @@ import android.os.Handler;
 
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
+import com.nextcloud.client.errorhandling.ExceptionHandler;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.lib.resources.status.OCCapability;
-import com.owncloud.android.ui.errorhandling.ExceptionHandler;
 
 import javax.inject.Inject;