Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
  • Loading branch information
tobiasKaminsky authored and AndyScherzinger committed May 21, 2019
1 parent d90c375 commit cf6aa1a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build.gradle
Expand Up @@ -356,6 +356,7 @@ dependencies {
//androidTestImplementation "com.android.support:support-annotations:${supportLibraryVersion}"
androidTestImplementation 'tools.fastlane:screengrab:1.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'

// jacocoAnt "org.jacoco:org.jacoco.ant:${jacocoVersion}"
// jacocoAgent "org.jacoco:org.jacoco.agent:${jacocoVersion}"
Expand Down
1 change: 0 additions & 1 deletion nextcloud-android-library

This file was deleted.

Expand Up @@ -48,9 +48,6 @@
import com.nextcloud.client.di.Injectable;
import com.nextcloud.client.preferences.AppPreferences;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.datamodel.PushConfigurationState;
import com.owncloud.android.authentication.AccountUtils;
import com.owncloud.android.datamodel.UserInfo;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation;
Expand All @@ -67,8 +64,6 @@

import javax.inject.Inject;

import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
import androidx.annotation.ColorRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.StringRes;
Expand Down Expand Up @@ -266,7 +261,7 @@ private void populateUserInfoUi(UserInfo userInfo) {

if (userInfo == null || userInfo.isEmpty()) {
setErrorMessageForMultiList(getString(R.string.userinfo_no_info_headline),
getString(R.string.userinfo_no_info_text), R.drawable.ic_user);
getString(R.string.userinfo_no_info_text));
} else {
if (!TextUtils.isEmpty(userInfo.getDisplayName())) {
fullName.setText(userInfo.getDisplayName());
Expand Down

0 comments on commit cf6aa1a

Please sign in to comment.