Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .idea/codeStyles/Project.xml

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

2 changes: 1 addition & 1 deletion scripts/analysis/findbugs-results.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
422
423
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
* Instrumented unit test, to be run in an Android emulator or device.
*
* At the moment, it's a sample to validate the automatic test environment, in the scope of instrumented unit tests.
*
*vvlcvlc
* Don't take it as an example of completeness.
*
* See http://developer.android.com/intl/es/training/testing/unit-testing/instrumented-unit-tests.html .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.res.Resources

import com.nextcloud.client.account.CurrentAccountProvider
import com.nextcloud.client.preferences.AppPreferences
import com.owncloud.android.BuildConfig
Expand All @@ -41,9 +40,10 @@ internal class OnboardingServiceImpl constructor(
const val ITEM_VERSION_CODE = 99999999
}

private val notSeenYet: Boolean get() {
return BuildConfig.VERSION_CODE >= ITEM_VERSION_CODE && preferences.lastSeenVersionCode < ITEM_VERSION_CODE
}
private val notSeenYet: Boolean
get() {
return BuildConfig.VERSION_CODE >= ITEM_VERSION_CODE && preferences.lastSeenVersionCode < ITEM_VERSION_CODE
}

override val whatsNew: Array<FeatureItem>
get() = if (!isFirstRun && notSeenYet) {
Expand Down
18 changes: 0 additions & 18 deletions src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
import com.owncloud.android.ui.events.AccountRemovedEvent;
import com.owncloud.android.ui.events.ChangeMenuEvent;
import com.owncloud.android.ui.events.DummyDrawerEvent;
import com.owncloud.android.ui.events.MenuItemClickEvent;
import com.owncloud.android.ui.events.SearchEvent;
import com.owncloud.android.ui.fragment.OCFileListFragment;
import com.owncloud.android.ui.trashbin.TrashbinActivity;
Expand Down Expand Up @@ -385,23 +384,6 @@ private void filterDrawerMenu(Menu menu, Account account) {
DrawerMenuUtil.removeMenuItem(menu, R.id.nav_logout, !getResources().getBoolean(R.bool.show_drawer_logout));
}

@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(MenuItemClickEvent event) {
unsetAllDrawerMenuItems();

switch (event.menuItem.getItemId()) {
case R.id.nav_bar_files:
showFiles(false);
break;
case R.id.nav_bar_settings:
Intent settingsIntent = new Intent(getApplicationContext(), SettingsActivity.class);
startActivity(settingsIntent);
break;
default:
break;
}
}

@Subscribe(threadMode = ThreadMode.MAIN)
public void onMessageEvent(DummyDrawerEvent event) {
unsetAllDrawerMenuItems();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import android.view.ViewGroup;
import android.widget.AbsListView;
import android.widget.PopupMenu;
import android.widget.RelativeLayout;

import com.google.android.material.snackbar.Snackbar;
import com.nextcloud.client.account.UserAccountManager;
Expand Down Expand Up @@ -279,17 +278,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
currentSearchType = SearchType.NO_SEARCH;
}

if (savedInstanceState != null) {
final View fabView = v.findViewById(R.id.fab_main);
final RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams)
fabView.getLayoutParams();
layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1);
new Handler().post(() -> {
fabView.setLayoutParams(layoutParams);
fabView.invalidate();
});
}

Bundle args = getArguments();
boolean allowContextualActions = args != null && args.getBoolean(ARG_ALLOW_CONTEXTUAL_ACTIONS, false);
if (allowContextualActions) {
Expand Down
14 changes: 0 additions & 14 deletions src/main/res/drawable/settings.xml

This file was deleted.

19 changes: 0 additions & 19 deletions src/main/res/menu/navigation_bar_menu.xml

This file was deleted.

1 change: 0 additions & 1 deletion src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<string name="drawer_item_recently_modified">Recently modified</string>
<string name="drawer_item_shared">Shared</string>
<string name="drawer_item_videos">Videos</string>
<string name="drawer_item_settings">Settings</string>
<string name="drawer_item_uploads_list">Uploads</string>
<string name="drawer_item_activities">Activities</string>
<string name="drawer_item_notifications">Notifications</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ import android.content.Intent
import android.os.BatteryManager
import android.os.Build
import android.os.PowerManager
import com.nhaarman.mockitokotlin2.*
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.anyOrNull
import com.nhaarman.mockitokotlin2.eq
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.never
import com.nhaarman.mockitokotlin2.verify
import com.nhaarman.mockitokotlin2.whenever
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
Expand Down