Removed ios part

Author: n4n0lix

.github/actions/setup/action.yml

@@ -23,6 +23,5 @@ runs:
     - name: Install dependencies
       if: steps.yarn-cache.outputs.cache-hit != 'true'
       run: |
-        yarn install --cwd example --frozen-lockfile
         yarn install --frozen-lockfile
       shell: bash

.github/workflows/ci.yml

@@ -45,107 +45,4 @@ jobs:
         uses: ./.github/actions/setup
 
       - name: Build package
-        run: yarn prepack
-
-  build-android:
-    runs-on: ubuntu-latest
-    env:
-      TURBO_CACHE_DIR: .turbo/android
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-
-      - name: Cache turborepo for Android
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.TURBO_CACHE_DIR }}
-          key: ${{ runner.os }}-turborepo-android-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-turborepo-android-
-
-      - name: Check turborepo cache for Android
-        run: |
-          TURBO_CACHE_STATUS=$(node -p "($(yarn --silent turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:android').cache.status")
-
-          if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
-            echo "turbo_cache_hit=1" >> $GITHUB_ENV
-          fi
-
-      - name: Install JDK
-        if: env.turbo_cache_hit != 1
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '11'
-
-      - name: Finalize Android SDK
-        if: env.turbo_cache_hit != 1
-        run: |
-          /bin/bash -c "yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses > /dev/null"
-
-      - name: Cache Gradle
-        if: env.turbo_cache_hit != 1
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/wrapper
-            ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
-      - name: Build example for Android
-        run: |
-          yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"
-
-  build-ios:
-    runs-on: macos-latest
-    env:
-      TURBO_CACHE_DIR: .turbo/ios
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup
-
-      - name: Cache turborepo for iOS
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.TURBO_CACHE_DIR }}
-          key: ${{ runner.os }}-turborepo-ios-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-turborepo-ios-
-
-      - name: Check turborepo cache for iOS
-        run: |
-          TURBO_CACHE_STATUS=$(node -p "($(yarn --silent turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}" --dry=json)).tasks.find(t => t.task === 'build:ios').cache.status")
-
-          if [[ $TURBO_CACHE_STATUS == "HIT" ]]; then
-            echo "turbo_cache_hit=1" >> $GITHUB_ENV
-          fi
-
-      - name: Cache cocoapods
-        if: env.turbo_cache_hit != 1
-        id: cocoapods-cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            **/ios/Pods
-          key: ${{ runner.os }}-cocoapods-${{ hashFiles('example/ios/Podfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cocoapods-
-
-      - name: Install cocoapods
-        if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
-        run: |
-          yarn example pods
-        env:
-          NO_FLIPPER: 1
-
-      - name: Build example for iOS
-        run: |
-          yarn turbo run build:ios --cache-dir="${{ env.TURBO_CACHE_DIR }}"
+        run: yarn prepack

.yarnrc.yml

@@ -2,7 +2,6 @@ nodeLinker: node-modules
 nmHoistingLimits: workspaces
 
 plugins:
-  - path: scripts/pod-install.cjs
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

android/build.gradle

@@ -44,7 +44,7 @@ def supportsNamespace() {
 
 android {
   if (supportsNamespace()) {
-    namespace "com.usagestatsmanager"
+    namespace "io.justdice.usagestats"
 
     sourceSets {
       main {

android/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.usagestatsmanager">
+          package="io.justdice.usagestats">
 </manifest>

android/src/main/java/com/usagestatsmanager/UsageStatsManagerModule.kt renamed to android/src/main/java/io/justdice/usagestats/UsageStatsManagerModule.kt

@@ -1,4 +1,4 @@
-package com.usagestatsmanager
+package io.justdice.usagestats
 
 import android.annotation.TargetApi
 import android.app.AppOpsManager
@@ -28,15 +28,16 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.bridge.WritableNativeArray
 import com.facebook.react.common.MapBuilder
-import com.usagestatsmanager.model.AppData
-import com.usagestatsmanager.utils.SortOrder
-import com.usagestatsmanager.utils.UsageUtils
-import com.usagestatsmanager.utils.UsageUtils.getAppUid
-import com.usagestatsmanager.utils.UsageUtils.getTimeRange
-import com.usagestatsmanager.utils.UsageUtils.humanReadableMillis
-import com.usagestatsmanager.utils.UsageUtils.isSystemApp
-import com.usagestatsmanager.utils.UsageUtils.parsePackageName
+import io.justdice.usagestats.model.AppData
+import io.justdice.usagestats.utils.SortOrder
+import io.justdice.usagestats.utils.UsageUtils
+import io.justdice.usagestats.utils.UsageUtils.getAppUid
+import io.justdice.usagestats.utils.UsageUtils.getTimeRange
+import io.justdice.usagestats.utils.UsageUtils.humanReadableMillis
+import io.justdice.usagestats.utils.UsageUtils.isSystemApp
+import io.justdice.usagestats.utils.UsageUtils.parsePackageName
 
 
 class UsageStatsManagerModule(reactContext: ReactApplicationContext) :
@@ -169,133 +170,37 @@ class UsageStatsManagerModule(reactContext: ReactApplicationContext) :
     return writableMap
   }
 
+  private fun containItem(items: List<AppData>, packageName: String): AppData? {
+    for (item in items) {
+      if (item.mPackageName == packageName) return item
+    }
+    return null
+  }
+
   @ReactMethod
   fun queryEvents(startTime: Double, endTime: Double, promise: Promise) {
-//    val result: WritableMap = WritableNativeMap()
-    val items: MutableList<AppData> = mutableListOf<AppData>()
-    val newList: MutableList<AppData> = mutableListOf()
+    val result = WritableNativeArray()
+
     val manager: UsageStatsManager =
         reactContext?.getSystemService(Context.USAGE_STATS_SERVICE) as UsageStatsManager
 
-    //      val events: UsageEvents = manager.queryEvents(startTime.toLong(), endTime.toLong())
-    var prevPackage: String? = ""
-    val startPoints: MutableMap<String, Long> = mutableMapOf()
-    val endPoints: MutableMap<String, ClonedEvent> = mutableMapOf()
-
-    val sortEnum: SortOrder = SortOrder.getSortEnum(0)
-    val range = getTimeRange(sortEnum)
-
-//    val events: UsageEvents = if (sortEnum.name.equals("MONTH", ignoreCase = true)) {
-//      manager.queryEvents(UsageStatsManager.INTERVAL_DAILY.toLong(), range[1])
-//    } else {
-//      manager.queryEvents(range[0], range[1])
-//    }
     val events: UsageEvents = manager.queryEvents(startTime.toLong(), endTime.toLong())
-
     val event = UsageEvents.Event()
-    while (events.hasNextEvent()) {
-      events.getNextEvent(event);
-
-      val eventType: Int = event.eventType
-      val eventTime: Long = event.timeStamp
-      val eventPackage: String = event.packageName
-
-      if (eventType === UsageEvents.Event.MOVE_TO_FOREGROUND) {
-        var item: AppData? = containItem(items, eventPackage)
-        if (item == null) {
-          item = AppData()
-          item.mPackageName = eventPackage
-          items.add(item)
-        }
-        if (!startPoints.containsKey(eventPackage)) {
-          startPoints.put(eventPackage, eventTime)
-        }
-      }
-
-      if (eventType == UsageEvents.Event.MOVE_TO_BACKGROUND) {
-        if (startPoints.isNotEmpty() && startPoints.containsKey(eventPackage)) {
-          endPoints[eventPackage] = ClonedEvent(event);
-        }
-      }
-
-      if (TextUtils.isEmpty(prevPackage)) prevPackage = eventPackage;
-      if (!prevPackage.equals(eventPackage)) {
-        if (startPoints.containsKey(prevPackage) && endPoints.containsKey(prevPackage)) {
-          val lastEndEvent = endPoints[prevPackage]
-          val listItem = containItem(items, prevPackage!!)
-          if (listItem != null) { // update list item info
-            listItem.mEventTime = lastEndEvent!!.timeStamp
-            var duration = lastEndEvent!!.timeStamp - startPoints[prevPackage]!!
-            if (duration <= 0) duration = 0
-            listItem.mUsageTime += duration
-            if (duration > UsageUtils.USAGE_TIME_MIX) {
-              listItem.mCount++
-            }
-          }
-          startPoints.remove(prevPackage)
-          endPoints.remove(prevPackage)
-        }
-        prevPackage = eventPackage
-      }
-    }
-
-    if (items.size > 0) {
-      var canCalculateDataUsage: Boolean = false
-
-      var mobileData: MutableMap<String?, Long?> = HashMap()
-      var wifiData: Map<String?, Long?>? = HashMap()
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        canCalculateDataUsage = true
-        val networkStatsManager = reactContext.getSystemService(Context.NETWORK_STATS_SERVICE)
-        val telephonyManager = reactContext.getSystemService(Context.TELEPHONY_SERVICE)
-//          mobileData = getMobileData(context, telephonyManager, networkStatsManager, offset)
-//          wifiData = getWifiUsageData(context, telephonyManager, networkStatsManager, offset)
-      } else {
-        mobileData["mobile"] = TrafficStats.getMobileRxBytes() + TrafficStats.getMobileTxBytes()
-      }
-
 
-      val hideSystem = true
-      val hideUninstall = true
-      val packageManager: PackageManager = reactContext.packageManager
+    while (events.hasNextEvent()) {
+      events.getNextEvent(event)
 
-      for (item in items) {
-//        if (!openable(packageManager, item.mPackageName!!)) {
-//          continue
-//        }
-        if (hideSystem && isSystemApp(packageManager, item.mPackageName!!)) {
-          continue
-        }
-//        if (hideUninstall && !isInstalled(packageManager, item.mPackageName!!)) {
-//          continue
-//        }
-        if (canCalculateDataUsage) {
-          val key = "u" + getAppUid(packageManager, item.mPackageName!!)
-//            if (mobileData.size() > 0 && mobileData.containsKey(key)) {
-//              item.mMobile = mobileData.get(key)
-//            }
-//            if (wifiData.size() > 0 && wifiData.containsKey(key)) {
-//              item.mWifi = wifiData.get(key)
-//            }
-        }
-        item.mName = parsePackageName(packageManager, item.mPackageName!!).toString()
-        newList.add(item)
-      }
+      val _event: WritableMap = WritableNativeMap()
+      _event.putInt("eventType", event.eventType)
+      _event.putDouble("timeStamp", event.timeStamp.toDouble())
+      _event.putString("packageName", event.packageName)
 
-      newList.sortWith(Comparator { left: AppData, right: AppData -> (right.mUsageTime - left.mUsageTime).toInt() })
+      result.pushMap(_event)
     }
-    promise.resolve(writeToWritableMap(newList))
-  }
 
-  private fun containItem(items: List<AppData>, packageName: String): AppData? {
-    for (item in items) {
-      if (item.mPackageName == packageName) return item
-    }
-    return null
+    promise.resolve(result)
   }
 
-
-
   @RequiresApi(Build.VERSION_CODES.P)
   @ReactMethod
   fun queryEventsStats(interval: Int, startTime: Double, endTime: Double, promise: Promise) {
@@ -482,7 +387,7 @@ class UsageStatsManagerModule(reactContext: ReactApplicationContext) :
   }
 
   companion object {
-    const val NAME = "UsageStatsManager"
+    const val NAME = "JustDiceReactNativeUsageStats"
   }
 }
 

android/src/main/java/com/usagestatsmanager/UsageStatsManagerPackage.kt renamed to android/src/main/java/io/justdice/usagestats/UsageStatsManagerPackage.kt

@@ -1,4 +1,4 @@
-package com.usagestatsmanager
+package io.justdice.usagestats
 
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule

android/src/main/java/com/usagestatsmanager/models/AppData.kt renamed to android/src/main/java/io/justdice/usagestats/models/AppData.kt

@@ -1,4 +1,4 @@
-package com.usagestatsmanager.model
+package io.justdice.usagestats.model
 
 import android.os.Parcel
 import android.os.Parcelable

android/src/main/java/com/usagestatsmanager/utils/SortOrder.kt renamed to android/src/main/java/io/justdice/usagestats/utils/SortOrder.kt

@@ -1,4 +1,4 @@
-package com.usagestatsmanager.utils
+package io.justdice.usagestats.utils
 
 /**
  * Created by BarryAllen

android/src/main/java/com/usagestatsmanager/utils/UsageUtils.kt renamed to android/src/main/java/io/justdice/usagestats/utils/UsageUtils.kt

@@ -1,4 +1,4 @@
-package com.usagestatsmanager.utils
+package io.justdice.usagestats.utils
 
 import android.content.Context
 import android.content.pm.ApplicationInfo