revert partial kotlinize ExpandableUploadListAdapter

hannesa2 · Nov 15, 2019 · 83689f3 · 83689f3
1 parent 2482002
commit 83689f3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/owncloud-android-library b/owncloud-android-library
diff --git a/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt b/owncloudApp/src/main/java/com/owncloud/android/MainApp.kt
@@ -244,18 +244,13 @@ class MainApp : MultiDexApplication() {
         val accountType: String
             get() = appContext!!.resources.getString(R.string.account_type)
 
-        @Suppress("DEPRECATION")
-        val versionCode: Long
+        val versionCode: Int
             get() {
-                return try {
+                try {
                     val thisPackageName = appContext!!.packageName
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                        appContext!!.packageManager.getPackageInfo(thisPackageName, 0).longVersionCode
-                    } else {
-                        appContext!!.packageManager.getPackageInfo(thisPackageName, 0).versionCode.toLong()
-                    }
+                    return appContext!!.packageManager.getPackageInfo(thisPackageName, 0).versionCode
                 } catch (e: PackageManager.NameNotFoundException) {
-                    0
+                    return 0
                 }
 
             }
+1 −1		owncloudComLibrary/build.gradle
+3 −4		owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java
+15 −175		owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/Log_OC.java
+24 −0		owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/LoggingHelper.kt