Merge pull request #340 from codingblazer/lint_issues_2

#279 lint issues solved
BuildmLearn · Jan 17, 2017 · d1755c2 · d1755c2
2 parents b8aa45e + d6987c0
commit d1755c2
Show file tree

Hide file tree

Showing 55 changed files with 171 additions and 160 deletions.
diff --git a/source-code/app/src/androidTest/java/org/buildmlearn/toolkit/espresso/ComprehensionTest.java b/source-code/app/src/androidTest/java/org/buildmlearn/toolkit/espresso/ComprehensionTest.java
@@ -93,6 +93,7 @@ private static void allowPermissionsIfNeeded() {
                 try {
                     allowPermissions.click();
                 } catch (UiObjectNotFoundException e) {
+                e.printStackTrace();
                 }
             }
         }
@@ -118,13 +119,13 @@ public void run() {
         });
     }
 
-    public void toolbarTitle() {
+    private void toolbarTitle() {
         String title = "Comprehension Template";
         onView(allOf(instanceOf(TextView.class), withParent(withId(R.id.toolbar))))
                 .check(matches(withText(title)));
     }
 
-    public void addMetaDetails() {
+    private void addMetaDetails() {
         String passTitle = "PassageTitle";
         String passage = "Short Passage.";
         String timer = "180";
@@ -143,7 +144,7 @@ public void addMetaDetails() {
 
     }
 
-    public void editMetaDetails() {
+    private void editMetaDetails() {
         String passTitle = "EditedPassageTitle";
         String passage = "EditedShort Passage.";
 
@@ -158,7 +159,7 @@ public void editMetaDetails() {
 
     }
 
-    public void addQuestions() {
+    private void addQuestions() {
         String question = "This is just a silly question whose answer is (b).";
 
         onView(withId(R.id.button_add_item)).perform(click());
@@ -180,7 +181,7 @@ public void addQuestions() {
 
     }
 
-    public void editQuestions() {
+    private void editQuestions() {
         String question = "This is just a silly question whose answer changed to (a).";
 
         onData(anything()).inAdapterView(withId(R.id.template_editor_listview)).atPosition(1).perform(longClick());
@@ -193,13 +194,13 @@ public void editQuestions() {
 
     }
 
-    public void addTemplate() {
+    private void addTemplate() {
 
         onView(withId(R.id.author_name)).perform(replaceText("Anupam"));
         onView(withId(R.id.template_title)).perform(replaceText("Testing template"));
     }
 
-    public void saveAPK() {
+    private void saveAPK() {
 
         onView(withId(R.id.action_save)).perform(click());
         onView(withText("Save APK")).perform(click());
@@ -235,7 +236,7 @@ public void perform(UiController uiController, View view) {
         return stringHolder[0];
     }
 
-    public void checkSimulator() {
+    private void checkSimulator() {
         onView(withId(R.id.action_simulate)).perform(click());
         onView(withText("Testing template")).check(matches(isDisplayed()));
         onView(withText("Anupam")).check(matches(isDisplayed()));

diff --git a/source-code/app/src/main/AndroidManifest.xml b/source-code/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
         android:required="true" />
 
     <application
+        android:fullBackupContent="true"
         android:name=".ToolkitApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/AboutBuildmLearn.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/AboutBuildmLearn.java
@@ -35,8 +35,8 @@ protected void onCreate(Bundle savedInstanceState) {
             ((TextView) findViewById(R.id.app_version)).setText(String.format(Locale.ENGLISH, "Version: %s", version));
         } catch (PackageManager.NameNotFoundException e) {
             assert findViewById(R.id.app_version) != null;
-            assert ((TextView) findViewById(R.id.app_version)) != null;
-            ((TextView) findViewById(R.id.app_version)).setText("Version: 2.5.0");
+            assert ( findViewById(R.id.app_version)) != null;
+            ((TextView) findViewById(R.id.app_version)).setText("Version: 1.0");
             e.printStackTrace();
         }
 

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/FirstRunActivity.java
@@ -11,6 +11,7 @@
 import android.view.animation.AnimationUtils;
 import android.widget.EditText;
 
+
 import com.crashlytics.android.Crashlytics;
 
 import org.buildmlearn.toolkit.R;

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/HomeActivity.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/HomeActivity.java
@@ -16,7 +16,7 @@
 import android.os.Handler;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;;
+import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
@@ -44,7 +44,7 @@ public class HomeActivity extends AppCompatActivity
 
     private SmoothNavigationToggle smoothNavigationToggle;
 
-    NavigationView navigationView;
+    private NavigationView navigationView;
 
     /**
      * {@inheritDoc}

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java
@@ -353,7 +353,7 @@ public void onRequestPermissionsResult(int requestCode,
                     ToolkitApplication mToolkitApplication = new ToolkitApplication();
                     mToolkitApplication.storagePathsValidate();
                 }
-                return;
+
             }
 
         }
@@ -683,10 +683,10 @@ private String saveProject() {
         EditText authorEditText = (EditText) findViewById(R.id.author_name);
         titleEditText = (EditText) findViewById(R.id.template_title);
         assert findViewById(R.id.author_name) != null;
-        assert ((EditText) findViewById(R.id.author_name)) != null;
+        assert ( findViewById(R.id.author_name)) != null;
         String author = ((EditText) findViewById(R.id.author_name)).getText().toString();
         assert findViewById(R.id.template_title) != null;
-        assert ((EditText) findViewById(R.id.template_title)) != null;
+        assert ( findViewById(R.id.template_title)) != null;
         String title = ((EditText) findViewById(R.id.template_title)).getText().toString();
         if ("".equals(author)) {
             assert authorEditText != null;
@@ -783,9 +783,9 @@ public void onBackPressed() {
      */
     private String saveDraft() {
 
-        assert ((EditText) findViewById(R.id.author_name)) != null;
+        assert ( findViewById(R.id.author_name)) != null;
         String author = ((EditText) findViewById(R.id.author_name)).getText().toString();
-        assert ((EditText) findViewById(R.id.template_title)) != null;
+        assert ( findViewById(R.id.template_title)) != null;
         String title = ((EditText) findViewById(R.id.template_title)).getText().toString();
 
 

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TemplateAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TemplateAdapter.java
@@ -40,7 +40,7 @@ public TemplateAdapter(Context context) {
         this.context = context;
     }
 
-    public static boolean cancelPotentialWork(int data, ImageView imageView) {
+    private static boolean cancelPotentialWork(int data, ImageView imageView) {
         final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
 
         if (bitmapWorkerTask != null) {
@@ -153,8 +153,8 @@ enum ListColor {
         final
         int color;
 
-        ListColor(String colorCode) {
-            this.color = Color.parseColor(colorCode);
+        ListColor( String colorCode) {
+            this.color =  Color.parseColor(colorCode);
         }
 
         public int getColor() {

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TutorialAdapter.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TutorialAdapter.java
@@ -8,7 +8,7 @@
 import android.preference.PreferenceManager;
 import android.support.annotation.ColorRes;
 import android.support.v4.view.PagerAdapter;
-import android.view.LayoutInflater;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -58,15 +58,14 @@ public Object instantiateItem(ViewGroup container, final int position) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mActivity);
         boolean SkipTutorial = prefs.getBoolean("SkipTutorial",false);
 
-        LayoutInflater inflater = (LayoutInflater) container.getContext()
-                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
 
         Tutorial tutorial = getItem(position);
 
 
         View convertView;
         if (tutorial.isLastScreen()) {
-            convertView = inflater.inflate(R.layout.tutorial_layout_finish, null);
+            convertView = View.inflate(mActivity,R.layout.tutorial_layout_finish, null);
 
             convertView.findViewById(R.id.finish_tutorial_button).setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -78,7 +77,7 @@ public void onClick(View v) {
                 }
             });
         } else {
-            convertView = inflater.inflate(R.layout.tutorial_layout, null);
+            convertView = View.inflate(mActivity,R.layout.tutorial_layout, null);
             View skip_button = convertView.findViewById(R.id.skip_button);
             skip_button.setVisibility(View.GONE);
             ImageView deviceImage = (ImageView) convertView

diff --git a/...pp/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/LastFragment.java b/...pp/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/LastFragment.java
@@ -67,7 +67,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

diff --git a/...pp/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/MainFragment.java b/...pp/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/MainFragment.java
@@ -68,7 +68,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

diff --git a/...rc/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/QuestionFragment.java b/...rc/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/QuestionFragment.java
@@ -68,7 +68,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

diff --git a/.../main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java b/.../main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java
@@ -2,6 +2,7 @@
 
 import android.app.FragmentManager;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
@@ -99,7 +100,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing
@@ -253,7 +254,7 @@ public void onError(String utteranceId) {
             });
         }
 
-        SharedPreferences prefs = getActivity().getSharedPreferences("Radio", getContext().MODE_PRIVATE);
+        SharedPreferences prefs = getActivity().getSharedPreferences("Radio", Context.MODE_PRIVATE);
         float rate = prefs.getInt("radio_b", 1);
         if (rate == 0) {
             rate = 0.5F;

diff --git a/...rc/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/MainActivityFragment.java b/...rc/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/MainActivityFragment.java
@@ -1,5 +1,6 @@
 package org.buildmlearn.toolkit.dictationtemplate.fragment;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
@@ -102,7 +103,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         AlertDialog welcomeAlert = builder.create();
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing
@@ -137,7 +138,7 @@ public void onItemClick(AdapterView<?> adapterView, View view, int position, lon
             mPosition = savedInstanceState.getInt(SELECTED_KEY);
         }
 
-        SharedPreferences prefs = getActivity().getSharedPreferences("Radio", getContext().MODE_PRIVATE);
+        SharedPreferences prefs = getActivity().getSharedPreferences("Radio", Context.MODE_PRIVATE);
         int pos = prefs.getInt("radio_b", 1);
         RadioGroup rg = (RadioGroup) rootView.findViewById(R.id.radio_group);
         rg.check(rg.getChildAt(pos).getId());
@@ -171,7 +172,7 @@ public void onLoadFinished(Loader<Cursor> cursorLoader, Cursor cursor) {
         rootView.findViewById(R.id.radioButton1).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", getContext().MODE_PRIVATE).edit();
+                SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", Context.MODE_PRIVATE).edit();
                 editor.putInt("radio_b", 0);
                 editor.apply();
             }
@@ -180,7 +181,7 @@ public void onClick(View v) {
         rootView.findViewById(R.id.radioButton2).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", getContext().MODE_PRIVATE).edit();
+                SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", Context.MODE_PRIVATE).edit();
                 editor.putInt("radio_b", 1);
                 editor.apply();
             }
@@ -189,7 +190,7 @@ public void onClick(View v) {
         rootView.findViewById(R.id.radioButton3).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", getContext().MODE_PRIVATE).edit();
+                SharedPreferences.Editor editor = getActivity().getSharedPreferences("Radio", Context.MODE_PRIVATE).edit();
                 editor.putInt("radio_b", 2);
                 editor.apply();
             }

diff --git a/.../main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/ResultActivityFragment.java b/.../main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/ResultActivityFragment.java
@@ -95,7 +95,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

diff --git a/...de/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/LastFragment.java b/...de/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/LastFragment.java
@@ -53,7 +53,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

diff --git a/...de/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java b/...de/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java
@@ -83,7 +83,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/SettingsFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/fragment/SettingsFragment.java
@@ -38,17 +38,17 @@ public class SettingsFragment extends PreferenceFragment {
     private static final int REQUEST_PICK_APK = 9985;
     private Preference prefUsername;
 
-    public static float deleteDirectory(File file, float size) {
+    private static float deleteDirectory(File file, float size) {
         if (file.exists()) {
             File[] listFiles = file.listFiles();
             if (listFiles == null) return 0;
 
-            for (int i = 0; i < listFiles.length; i++) {
-                if (listFiles[i].isDirectory()) {
-                    size += deleteDirectory(listFiles[i], 0);
+            for (File listFile : listFiles) {
+                if (listFile.isDirectory()) {
+                    size += deleteDirectory(listFile, 0);
                 } else {
-                    size += listFiles[i].length();
-                    listFiles[i].delete();
+                    size += listFile.length();
+                    listFile.delete();
                 }
             }
         }
@@ -140,9 +140,9 @@ public void initRestoreProjectDialog() {
         startActivityForResult(intent, REQUEST_PICK_APK);
     }
 
-    public void resetUserName() {
-        LayoutInflater inflater = getActivity().getLayoutInflater();
-        View dialogView = inflater.inflate(R.layout.dialog_settings_your_name, null);
+    private void resetUserName() {
+
+        View dialogView = View.inflate(getActivity(),R.layout.dialog_settings_your_name, null);
         final EditText editInput = (EditText) dialogView.findViewById(R.id.et_dialog_settings_your_name);
         editInput.setText(prefUsername.getSummary());
 

diff --git a/...p/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/DetailActivityFragment.java b/...p/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/DetailActivityFragment.java
@@ -87,7 +87,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

diff --git a/...app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/MainActivityFragment.java b/...app/src/main/java/org/buildmlearn/toolkit/infotemplate/fragment/MainActivityFragment.java
@@ -98,7 +98,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         AlertDialog welcomeAlert = builder.create();
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
-                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
+                        assert ( welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing