Merge pull request #294 from unstablebrainiac/bug-fixes

Minor bug fixes

app/src/main/java/app/insti/adapter/NewsAdapter.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -19,10 +18,7 @@ import java.util.Locale;
 
 import app.insti.R;
 import app.insti.api.model.NewsArticle;
-import app.insti.fragment.NewsFragment;
 import app.insti.interfaces.ItemClickListener;
-import app.insti.interfaces.Readable;
-import app.insti.interfaces.Writable;
 import ru.noties.markwon.Markwon;
 
 public class NewsAdapter extends RecyclerViewAdapter<NewsArticle> {
@@ -69,15 +65,6 @@ public class NewsAdapter extends RecyclerViewAdapter<NewsArticle> {
         }
     }
 
-    public static class ProgressViewHolder extends RecyclerView.ViewHolder {
-        public ProgressBar progressBar;
-
-        public ProgressViewHolder(View v) {
-            super(v);
-            progressBar = v.findViewById(R.id.blog_load_item);
-        }
-    }
-
     public class ViewHolder extends RecyclerView.ViewHolder {
         private TextView articleTitle;
         private TextView articleBody;

app/src/main/java/app/insti/adapter/PlacementBlogAdapter.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -19,10 +18,7 @@ import java.util.Locale;
 
 import app.insti.R;
 import app.insti.api.model.PlacementBlogPost;
-import app.insti.fragment.PlacementBlogFragment;
 import app.insti.interfaces.ItemClickListener;
-import app.insti.interfaces.Readable;
-import app.insti.interfaces.Writable;
 import ru.noties.markwon.Markwon;
 
 public class PlacementBlogAdapter extends RecyclerViewAdapter<PlacementBlogPost> {
@@ -65,15 +61,6 @@ public class PlacementBlogAdapter extends RecyclerViewAdapter<PlacementBlogPost>
         }
     }
 
-    public static class ProgressViewHolder extends RecyclerView.ViewHolder {
-        public ProgressBar progressBar;
-
-        public ProgressViewHolder(View v) {
-            super(v);
-            progressBar = v.findViewById(R.id.blog_load_item);
-        }
-    }
-
     public class ViewHolder extends RecyclerView.ViewHolder {
         private TextView postTitle;
         private TextView postPublished;

app/src/main/java/app/insti/adapter/TrainingBlogAdapter.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -19,10 +18,7 @@ import java.util.Locale;
 
 import app.insti.R;
 import app.insti.api.model.TrainingBlogPost;
-import app.insti.fragment.TrainingBlogFragment;
 import app.insti.interfaces.ItemClickListener;
-import app.insti.interfaces.Readable;
-import app.insti.interfaces.Writable;
 import ru.noties.markwon.Markwon;
 
 public class TrainingBlogAdapter extends RecyclerViewAdapter<TrainingBlogPost> {
@@ -65,16 +61,6 @@ public class TrainingBlogAdapter extends RecyclerViewAdapter<TrainingBlogPost> {
         }
     }
 
-
-    public static class ProgressViewHolder extends RecyclerView.ViewHolder {
-        public ProgressBar progressBar;
-
-        public ProgressViewHolder(View v) {
-            super(v);
-            progressBar = v.findViewById(R.id.blog_load_item);
-        }
-    }
-
     public class ViewHolder extends RecyclerView.ViewHolder {
         private TextView postTitle;
         private TextView postPublished;

app/src/main/java/app/insti/api/model/User.java

 package app.insti.api.model;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 
 import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
 import com.google.gson.annotations.SerializedName;
 
 import java.util.List;
@@ -75,7 +78,12 @@ public class User implements CardInterface {
     }
 
     public static User fromString(String json) {
-        return new Gson().fromJson(json, User.class);
+        try {
+            return new Gson().fromJson(json, User.class);
+        } catch (JsonSyntaxException e) {
+            Log.d("User", "fromString: " + json);
+            return null;
+        }
     }
 
     @NonNull

app/src/main/java/app/insti/fragment/CalendarFragment.java

@@ -256,7 +256,7 @@ public class CalendarFragment extends BaseFragment {
             @Override
             public void onFailure(Call<NewsFeedResponse> call, Throwable t) {
                 //Network Error
-                Toast.makeText(getContext(), "Failed to fetch events!", Toast.LENGTH_SHORT).show();
+                Toast.makeText(getActivity(), "Failed to fetch events!", Toast.LENGTH_SHORT).show();
             }
         });
     }

app/src/main/java/app/insti/fragment/NotificationsFragment.java

@@ -71,7 +71,7 @@ public class NotificationsFragment extends BottomSheetDialogFragment {
                     showNotifications(Utils.notificationCache);
 
                     NotificationId.setCurrentCount(Utils.notificationCache.size());
-                    ShortcutBadger.applyCount(getContext().getApplicationContext(), NotificationId.getCurrentCount());
+                    ShortcutBadger.applyCount(getContext(), NotificationId.getCurrentCount());
                 }
             }
         });

app/src/main/java/app/insti/fragment/RecyclerViewFragment.java

@@ -21,18 +21,17 @@ import app.insti.ActivityBuffer;
 import app.insti.R;
 import app.insti.Utils;
 import app.insti.activity.MainActivity;
+import app.insti.adapter.RecyclerViewAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.interfaces.Clickable;
 import app.insti.interfaces.ItemClickListener;
-import app.insti.interfaces.Readable;
-import app.insti.interfaces.Writable;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
 import static android.view.View.GONE;
 
-public abstract class RecyclerViewFragment<T extends Clickable, S extends RecyclerView.Adapter<RecyclerView.ViewHolder> & Readable<T> & Writable<T>> extends BaseFragment {
+public abstract class RecyclerViewFragment<T extends Clickable, S extends RecyclerViewAdapter<T>> extends BaseFragment {
     public static boolean showLoader = true;
     protected RecyclerView recyclerView;
     protected Class<T> postType;