Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08c5b51c authored by vince-bourgmayer's avatar vince-bourgmayer
Browse files

Remove commented code in AppConstants. Add a logcat into ResetService. Remove... 

Remove commented code in AppConstants. Add a logcat into ResetService. Remove starting scanner job in OperationManagerService (copy/paste issue) and remove import in InitializerService
parent e2e3fa14

app/src/main/AndroidManifest.xml

+1 −4
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ http://www.gnu.org/licenses/gpl.html 
        android:allowBackup="true"

        android:icon="@mipmap/ic_eelo"

        android:label="@string/app_name"

        android:roundIcon="@mipmap/ic_eelo_round"

        android:supportsRtl="true">

        android:roundIcon="@mipmap/ic_eelo_round">

        <provider

            android:authorities="io.eelo.drive.providers.MediasSyncProvider"

            android:name="io.eelo.drive.providers.MediasSyncProvider"
@@ -43,7 +42,6 @@ http://www.gnu.org/licenses/gpl.html 
                <action android:name="drive.services.InitializerService" />

            </intent-filter>

        </service>



        <service android:name=".services.ResetService"

            android:enabled="true"

            android:exported="true">
@@ -57,7 +55,6 @@ http://www.gnu.org/licenses/gpl.html 
            android:enabled="true"

            android:exported="true">

        </service>



        <service android:name=".services.OperationManagerService"/>

        <receiver android:name=".receivers.BatteryStateReceiver" android:enabled="true">

            <intent-filter>

app/src/main/java/io/eelo/drive/services/InitializerService.java

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ package io.eelo.drive.services; 


import android.accounts.Account;

import android.accounts.AccountManager;

import android.app.NotificationChannel;

import android.app.NotificationManager;

import android.app.Service;

import android.content.Context;

import android.content.Intent;

app/src/main/java/io/eelo/drive/services/OperationManagerService.java

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ public class OperationManagerService extends Service implements OnRemoteOperatio 
        this.mStartedOperations = new Hashtable<RemoteOperation, Integer>();

        this.lockedfilePath = new ArrayList<String>();



        JobUtils.scheduleScannerJob(this, 120000);

        NotificationManager nM = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);



        nM.createNotificationChannel(new NotificationChannel(AppConstants.notificationChannelID, AppConstants.notificationChannelName, NotificationManager.IMPORTANCE_DEFAULT));

app/src/main/java/io/eelo/drive/services/ResetService.java

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ public class ResetService extends Service { 


    @Override

    public int onStartCommand(Intent intent, int flags, int startId) {

        Log.i(TAG, "onStartCommand()");

        if( intent.getExtras() != null ) {

            String intent_accountName = intent.getExtras().getString(AccountManager.KEY_ACCOUNT_NAME, "");

            String intent_accountType = intent.getExtras().getString(AccountManager.KEY_ACCOUNT_TYPE, "");

app/src/main/java/io/eelo/drive/utils/AppConstants.java

+0 −19
Original line number Diff line number Diff line
@@ -28,25 +28,6 @@ public abstract class AppConstants { 
    public static final String[] MEDIA_SYNCABLE_CATEGORIES = new String[]{"Images", "Movies", "Music", "Ringtones", "Documents", "Podcasts"};

    public static final String[] SETTINGS_SYNCABLE_CATEGORIES = new String[] {"Rom settings"};





    public final static String notificationChannelID ="3310";

    public final static String notificationChannelName="eDrive channel";





    /*public static final int FLAG_SCANREMOTE = 1; // 0001 scan remote & settings & inactive

    public static final int FLAG_SCANLOCAL = 2; // 0010 scan local & settings & inactive

    //0x3 = SCANBOTH & Settings & inactive

    public static final int FLAG_MEDIA_SYNCABLE = 4; // 0100

    //0x5 = SCANREMOTE & Media & inactive

    //0x6 = SCANLOCAL & Media & inactive

    //0x7 = SCANBOTH & Media & inactive

    public static final int FLAG_ACTIVE = 8; // 1000

    //0x9 = 1001 : scan remote, settings and active

    //0xA = 1010: active, settings and scan local

    //0xB = 1011: active, scan both & settings

    //0xC = 1100 : active, media, noscan

    //0xD = 1101: active, media, scanRemote

    //0xE = 1110: active, media, scanLocal

    //0xF = 1111: active, media, scanBoth */



}