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

Commit f2dc0cab authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4339-Set_log_level_for_release_build' into 'main' 

4339-Set_log_level_for_release_build

See merge request !33
parents 1432409d dd5bbff8

.gitlab-ci.yml

+0 −8
Original line number Diff line number Diff line
@@ -5,14 +5,6 @@ stages: 
  - build



before_script:

  - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi

  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'

  - eval $(ssh-agent -s)

  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null

  - mkdir -p ~/.ssh

  - chmod 700 ~/.ssh

  - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts

  - chmod 644 ~/.ssh/known_hosts

  - export GRADLE_USER_HOME=$(pwd)/.gradle

  - chmod +x ./gradlew

app/build.gradle

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ dependencies { 
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.6'



    // Nextcloud SSO

    implementation 'foundation.e.lib:Android-SingleSignOn:1.0.2-alpha'

    implementation 'foundation.e.lib:Android-SingleSignOn:1.0.3-alpha'

    implementation ('com.github.stefan-niedermann:android-commons:0.2.7') {

        exclude group: 'com.github.nextcloud', module: 'Android-SingleSignOn'

    }
@@ -109,4 +109,5 @@ dependencies { 


    implementation fileTree(dir: 'libs', include: ['*.jar'])

    implementation 'foundation.e:elib:0.0.1-alpha11'

    implementation 'co.trikita:log:1.1.5'

}

app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ package it.niedermann.owncloud.notes; 


import android.os.Bundle;

import android.text.TextUtils;

import android.util.Log;

import trikita.log.Log;

import android.view.View;

import android.widget.Toast;

app/src/main/java/it/niedermann/owncloud/notes/LockedActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import android.app.KeyguardManager; 
import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.util.Log;

import trikita.log.Log;

import android.view.WindowManager;



import androidx.annotation.Nullable;

app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java

+9 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import android.app.Application; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.util.Log;

import trikita.log.Log;



import androidx.appcompat.app.AppCompatDelegate;

import androidx.preference.PreferenceManager;
@@ -28,6 +28,8 @@ public class NotesApplication extends Application { 
        final var prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());

        lockedPreference = prefs.getBoolean(getString(R.string.pref_key_lock), false);

        isGridViewEnabled = getDefaultSharedPreferences(this).getBoolean(getString(R.string.pref_key_gridview), false);



        setLogLevel();

        super.onCreate();

    }
@@ -80,4 +82,10 @@ public class NotesApplication extends Application { 
    public static void updateLastInteraction() {

        lastInteraction = System.currentTimeMillis();

    }



    private void setLogLevel() {

        if (!BuildConfig.DEBUG) {

            Log.level(Log.E);

        }

    }

}