summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-10-21 16:54:58 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2016-10-21 17:05:00 +0200
commit9abe9cac2c92212f50e8df5a49330f950cfc3846 (patch)
tree702a0abf48b7171de5e26cc648837fada1a7893d
parent1d71cf10649c3ea5c0b975b077beb7a7db3d9c6b (diff)
Android context classes should not be static
As the inspection message reads: "Do not place Android context classes in static fields; this is a memory leak (and also breaks Instant Run)" also remove three unused imports Change-Id: I87d19ca976dd600f957f407920c03f673007d49f
-rw-r--r--android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java1
-rw-r--r--android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java8
2 files changed, 3 insertions, 6 deletions
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
index 22df468..89c8c4e 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputerCreationActivity.java
@@ -12,7 +12,6 @@ import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.TextInputLayout;
-import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.app.AppCompatDelegate;
diff --git a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
index a519d97..603a45e 100644
--- a/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
+++ b/android/sdremote/mobile/src/main/java/org/libreoffice/impressremote/activity/ComputersActivity.java
@@ -16,13 +16,11 @@ import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.TabLayout;
import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.view.Window;
import android.view.animation.AnimationUtils;
import org.libreoffice.impressremote.adapter.ComputersPagerAdapter;
@@ -35,11 +33,11 @@ public class ComputersActivity extends AppCompatActivity {
private static final String SELECT_BLUETOOTH = "SELECT_BLUETOOTH";
private static final BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter();
private static final boolean disableBTOnQuit = btAdapter != null && !btAdapter.isEnabled();
- private static TabLayout tabLayout;
+ private TabLayout tabLayout;
private static TabLayout.Tab btTab;
private static TabLayout.Tab wifiTab;
- private static FloatingActionButton btFab;
- private static FloatingActionButton addFab;
+ private FloatingActionButton btFab;
+ private FloatingActionButton addFab;
private final ComputersPagerAdapter computersPagerAdapter = new ComputersPagerAdapter(getSupportFragmentManager(), this);
@Override