Version 0.4.3

README.md

@@ -6,7 +6,7 @@
 [![BCH compliance](https://bettercodehub.com/edge/badge/wulkanowy/wulkanowy?branch=master)](https://bettercodehub.com/)
 [![Scrutinizer](https://img.shields.io/scrutinizer/g/wulkanowy/wulkanowy.svg?style=flat-square)](https://scrutinizer-ci.com/g/wulkanowy/wulkanowy/?branch=master)
 [![Bintray](https://img.shields.io/bintray/v/wulkanowy/wulkanowy/api.svg?style=flat-square)](https://bintray.com/wulkanowy/wulkanowy/api)
-[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/JMG2rhJ)
+[![Discord](https://img.shields.io/discord/390889354199040011.svg?style=flat-square)](https://discord.gg/vccAQBr)
 
 [Pobierz wersję beta](https://play.google.com/store/apps/details?id=io.github.wulkanowy&utm_source=vcs)
 

api/src/main/java/io/github/wulkanowy/api/Client.java

@@ -63,7 +63,7 @@ public class Client {
 
     private boolean isLoggedIn() {
         return getCookies().size() > 0 && lastSuccessRequest != null &&
-                29 > TimeUnit.MILLISECONDS.toMinutes(new Date().getTime() - lastSuccessRequest.getTime());
+                5 > TimeUnit.MILLISECONDS.toMinutes(new Date().getTime() - lastSuccessRequest.getTime());
 
     }
 
@@ -142,7 +142,7 @@ public class Client {
 
         this.cookies.addItems(response.cookies());
 
-        response.bufferUp(); // fixes cert parsing issues
+        response.bufferUp(); // fixes cert parsing issues #109
 
         return checkForErrors(response.parse());
     }
@@ -195,8 +195,8 @@ public class Client {
             throw new NotLoggedInErrorException(singIn);
         }
 
-        if ("Błąd strony".equals(title)) {
-            throw new VulcanException("Nieznany błąd");
+        if (title.startsWith("Błąd")) {
+            throw new NotLoggedInErrorException(title + " " + doc.selectFirst("p, body"));
         }
 
         return doc;

api/src/main/java/io/github/wulkanowy/api/attendance/AttendanceTable.java

@@ -63,7 +63,7 @@ public class AttendanceTable {
             for (int i = 1; i < size; i++) {
                 Lesson lesson = new Lesson();
                 lesson.setDate(days.get(i - 1).getDate());
-                lesson.setNumber(hours.get(0).text());
+                lesson.setNumber(Integer.valueOf(hours.get(0).text()));
 
                 addLessonDetails(lesson, hours.get(i));
 

api/src/main/java/io/github/wulkanowy/api/generic/Lesson.java

@@ -2,7 +2,7 @@ package io.github.wulkanowy.api.generic;
 
 public class Lesson {
 
-    private String number = "";
+    private int number = 0;
 
     private String subject = "";
 
@@ -48,12 +48,13 @@ public class Lesson {
 
     private boolean isExemption = false;
 
-    public String getNumber() {
+    public int getNumber() {
         return number;
     }
 
-    public void setNumber(String number) {
+    public Lesson setNumber(int number) {
         this.number = number;
+        return this;
     }
 
     public String getSubject() {

api/src/main/java/io/github/wulkanowy/api/login/Login.java

@@ -36,29 +36,29 @@ public class Login {
                 {"Password", password}
         };
 
-        String nextUrl = LOGIN_PAGE_URL;
-        Document loginPage = client.getPageByUrl(nextUrl, false);
+        Document nextDoc = sendCredentialsData(credentials, LOGIN_PAGE_URL);
 
-        Element formFirst = loginPage.select("#form1").first();
-        if (null != formFirst) { // on adfs login
-            Document formSecond = client.postPageByUrl(
-                    formFirst.attr("abs:action"),
-                    getFormStateParams(formFirst, "", "")
-            );
-            credentials = getFormStateParams(formSecond, email, password);
-            nextUrl = formSecond.select("#form1").first().attr("abs:action");
-        } else if (!"Logowanie".equals(loginPage.select("#h1Default").text())) {
-            throw new VulcanException("Expected login page, got page with title: " + loginPage.title());
-        }
-
-        Document html = client.postPageByUrl(nextUrl, credentials);
-
-        Element errorMessage = html.select(".ErrorMessage, #ErrorTextLabel").first();
+        Element errorMessage = nextDoc.selectFirst(".ErrorMessage, #ErrorTextLabel");
         if (null != errorMessage) {
             throw new BadCredentialsException(errorMessage.text());
         }
 
-        return html;
+        return nextDoc;
+    }
+
+    private Document sendCredentialsData(String[][] credentials, String nextUrl) throws IOException, VulcanException {
+        Element formFirst = client.getPageByUrl(nextUrl, false).selectFirst("#form1");
+
+        if (null != formFirst) { // only on adfs login
+            Document formSecond = client.postPageByUrl(
+                    formFirst.attr("abs:action"),
+                    getFormStateParams(formFirst, "", "")
+            );
+            credentials = getFormStateParams(formSecond, credentials[0][1], credentials[1][1]);
+            nextUrl = formSecond.selectFirst("#form1").attr("abs:action");
+        }
+
+        return client.postPageByUrl(nextUrl, credentials);
     }
 
     private String[][] getFormStateParams(Element form, String email, String password) {
@@ -77,13 +77,7 @@ public class Login {
     }
 
     String sendCertificate(Document doc, String defaultSymbol) throws IOException, VulcanException {
-        String certificate = doc.select("input[name=wresult]").val();
-
-        if ("".equals(certificate)) {
-            throw new VulcanException("Expected certificate, got empty string. Page title: " + doc.title());
-        }
-
-        client.setSymbol(findSymbol(defaultSymbol, certificate));
+        client.setSymbol(findSymbol(defaultSymbol, doc.select("input[name=wresult]").val()));
 
         Document targetDoc = sendCertData(doc);
         String title = targetDoc.title();
@@ -106,10 +100,6 @@ public class Login {
     private Document sendCertData(Document doc) throws IOException, VulcanException {
         String url = doc.select("form[name=hiddenform]").attr("action");
 
-        if (!doc.title().equals("Working...")) {
-            throw new VulcanException("Expected certificate page, got page with title: " + doc.title());
-        }
-
         return client.postPageByUrl(url.replaceFirst("Default", "{symbol}"), new String[][]{
                 {"wa", "wsignin1.0"},
                 {"wresult", doc.select("input[name=wresult]").val()},

api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java

@@ -81,7 +81,7 @@ public class Timetable {
                 lesson.setStartTime(startEndEnd[0]);
                 lesson.setEndTime(startEndEnd[1]);
                 lesson.setDate(days.get(i - 2).getDate());
-                lesson.setNumber(hours.get(0).text());
+                lesson.setNumber(Integer.valueOf(hours.get(0).text()));
 
                 addLessonDetails(lesson, hours.get(i).select("div"));
 

api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java

@@ -83,11 +83,11 @@ public class TimetableTest extends StudentAndParentTestCase {
 
     @Test
     public void getLessonNumberTest() throws Exception {
-        Assert.assertEquals("2", std.getWeekTable().getDay(0).getLesson(1).getNumber());
-        Assert.assertEquals("5", std.getWeekTable().getDay(2).getLesson(4).getNumber());
-        Assert.assertEquals("0", full.getWeekTable().getDay(0).getLesson(0).getNumber());
-        Assert.assertEquals("13", full.getWeekTable().getDay(4).getLesson(13).getNumber());
-        Assert.assertEquals("3", holidays.getWeekTable().getDay(3).getLesson(3).getNumber());
+        Assert.assertEquals(2, std.getWeekTable().getDay(0).getLesson(1).getNumber());
+        Assert.assertEquals(5, std.getWeekTable().getDay(2).getLesson(4).getNumber());
+        Assert.assertEquals(0, full.getWeekTable().getDay(0).getLesson(0).getNumber());
+        Assert.assertEquals(13, full.getWeekTable().getDay(4).getLesson(13).getNumber());
+        Assert.assertEquals(3, holidays.getWeekTable().getDay(3).getLesson(3).getNumber());
     }
 
     @Test

app/build.gradle

@@ -41,8 +41,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 15
         targetSdkVersion 26
-        versionCode 10
-        versionName "0.4.2"
+        versionCode 11
+        versionName "0.4.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         playAccountConfig = playAccountConfigs.defaultAccountConfig
@@ -91,7 +91,7 @@ play {
 }
 
 greendao {
-    schemaVersion 27
+    schemaVersion 28
     generateTests = true
 }
 

app/src/main/java/io/github/wulkanowy/data/db/dao/DbHelper.java

@@ -19,6 +19,7 @@ import io.github.wulkanowy.data.db.dao.entities.DaoMaster;
 import io.github.wulkanowy.data.db.dao.migrations.Migration23;
 import io.github.wulkanowy.data.db.dao.migrations.Migration26;
 import io.github.wulkanowy.data.db.dao.migrations.Migration27;
+import io.github.wulkanowy.data.db.dao.migrations.Migration28;
 import io.github.wulkanowy.data.db.shared.SharedPrefContract;
 import io.github.wulkanowy.di.annotations.ApplicationContext;
 import io.github.wulkanowy.di.annotations.DatabaseInfo;
@@ -78,6 +79,7 @@ public class DbHelper extends DaoMaster.OpenHelper {
         migrations.add(new Migration23());
         migrations.add(new Migration26());
         migrations.add(new Migration27());
+        migrations.add(new Migration28());
 
         // Sorting just to be safe, in case other people add migrations in the wrong order.
         Comparator<Migration> migrationComparator = new Comparator<Migration>() {

app/src/main/java/io/github/wulkanowy/data/db/dao/entities/Day.java

@@ -5,6 +5,7 @@ import org.greenrobot.greendao.annotation.Entity;
 import org.greenrobot.greendao.annotation.Generated;
 import org.greenrobot.greendao.annotation.Id;
 import org.greenrobot.greendao.annotation.Index;
+import org.greenrobot.greendao.annotation.OrderBy;
 import org.greenrobot.greendao.annotation.Property;
 import org.greenrobot.greendao.annotation.ToMany;
 
@@ -35,9 +36,11 @@ public class Day {
     @Property(nameInDb = "free_day_name")
     private String freeDayName = "";
 
+    @OrderBy("number ASC")
     @ToMany(referencedJoinProperty = "dayId")
     private List<TimetableLesson> timetableLessons;
 
+    @OrderBy("number ASC")
     @ToMany(referencedJoinProperty = "dayId")
     private List<AttendanceLesson> attendanceLessons;
 
@@ -50,9 +53,7 @@ public class Day {
     @Generated(hash = 2040040024)
     private transient DaoSession daoSession;
 
-    /**
-     * Used for active entity operations.
-     */
+    /** Used for active entity operations. */
     @Generated(hash = 312167767)
     private transient DayDao myDao;
 
@@ -185,6 +186,36 @@ public class Day {
         attendanceLessons = null;
     }
 
+    /**
+     * To-many relationship, resolved on first access (and after reset).
+     * Changes to to-many relations are not persisted, make changes to the target entity.
+     */
+    @Generated(hash = 1231531946)
+    public List<Exam> getExams() {
+        if (exams == null) {
+            final DaoSession daoSession = this.daoSession;
+            if (daoSession == null) {
+                throw new DaoException("Entity is detached from DAO context");
+            }
+            ExamDao targetDao = daoSession.getExamDao();
+            List<Exam> examsNew = targetDao._queryDay_Exams(id);
+            synchronized (this) {
+                if (exams == null) {
+                    exams = examsNew;
+                }
+            }
+        }
+        return exams;
+    }
+
+    /**
+     * Resets a to-many relationship, making the next get call to query for a fresh result.
+     */
+    @Generated(hash = 841969952)
+    public synchronized void resetExams() {
+        exams = null;
+    }
+
     /**
      * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
      * Entity must attached to an entity context.
@@ -221,40 +252,12 @@ public class Day {
         myDao.update(this);
     }
 
-    /**
-     * To-many relationship, resolved on first access (and after reset).
-     * Changes to to-many relations are not persisted, make changes to the target entity.
-     */
-    @Generated(hash = 1231531946)
-    public List<Exam> getExams() {
-        if (exams == null) {
-            final DaoSession daoSession = this.daoSession;
-            if (daoSession == null) {
-                throw new DaoException("Entity is detached from DAO context");
-            }
-            ExamDao targetDao = daoSession.getExamDao();
-            List<Exam> examsNew = targetDao._queryDay_Exams(id);
-            synchronized (this) {
-                if (exams == null) {
-                    exams = examsNew;
-                }
-            }
-        }
-        return exams;
-    }
-
-    /**
-     * Resets a to-many relationship, making the next get call to query for a fresh result.
-     */
-    @Generated(hash = 841969952)
-    public synchronized void resetExams() {
-        exams = null;
-    }
-
     /** called by internal mechanisms, do not call yourself. */
     @Generated(hash = 1409317752)
     public void __setDaoSession(DaoSession daoSession) {
         this.daoSession = daoSession;
         myDao = daoSession != null ? daoSession.getDayDao() : null;
     }
+
+
 }

app/src/main/java/io/github/wulkanowy/data/db/dao/entities/TimetableLesson.java

@@ -1,5 +1,7 @@
 package io.github.wulkanowy.data.db.dao.entities;
 
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.greenrobot.greendao.DaoException;
 import org.greenrobot.greendao.annotation.Entity;
 import org.greenrobot.greendao.annotation.Generated;
@@ -12,7 +14,7 @@ import java.io.Serializable;
 @Entity(
         nameInDb = "TimetableLessons",
         active = true,
-        indexes = {@Index(value = "dayId,date,startTime,endTime", unique = true)}
+        indexes = {@Index(value = "dayId,date,number,startTime,endTime", unique = true)}
 )
 public class TimetableLesson implements Serializable {
 
@@ -25,7 +27,7 @@ public class TimetableLesson implements Serializable {
     private Long dayId;
 
     @Property(nameInDb = "number")
-    private String number;
+    private int number = 0;
 
     @Property(nameInDb = "subject")
     private String subject = "";
@@ -75,18 +77,15 @@ public class TimetableLesson implements Serializable {
     @Generated(hash = 2040040024)
     private transient DaoSession daoSession;
 
-    /**
-     * Used for active entity operations.
-     */
+    /** Used for active entity operations. */
     @Generated(hash = 1119360138)
     private transient TimetableLessonDao myDao;
 
-    @Generated(hash = 1955911128)
-    public TimetableLesson(Long id, Long dayId, String number, String subject,
-                           String teacher, String room, String description, String group,
-                           String startTime, String endTime, String date, boolean empty,
-                           boolean divisionIntoGroups, boolean planning, boolean realized,
-                           boolean movedOrCanceled, boolean newMovedInOrChanged) {
+    @Generated(hash = 1665905034)
+    public TimetableLesson(Long id, Long dayId, int number, String subject, String teacher,
+                           String room, String description, String group, String startTime, String endTime,
+                           String date, boolean empty, boolean divisionIntoGroups, boolean planning,
+                           boolean realized, boolean movedOrCanceled, boolean newMovedInOrChanged) {
         this.id = id;
         this.dayId = dayId;
         this.number = number;
@@ -109,7 +108,7 @@ public class TimetableLesson implements Serializable {
     @Generated(hash = 1878030142)
     public TimetableLesson() {
     }
-
+    
     public Long getId() {
         return this.id;
     }
@@ -127,11 +126,11 @@ public class TimetableLesson implements Serializable {
         return this;
     }
 
-    public String getNumber() {
+    public int getNumber() {
         return this.number;
     }
 
-    public TimetableLesson setNumber(String number) {
+    public TimetableLesson setNumber(int number) {
         this.number = number;
         return this;
     }
@@ -262,6 +261,32 @@ public class TimetableLesson implements Serializable {
         return this;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+
+        if (o == null || getClass() != o.getClass()) return false;
+
+        TimetableLesson lesson = (TimetableLesson) o;
+
+        return new EqualsBuilder()
+                .append(number, lesson.number)
+                .append(startTime, lesson.startTime)
+                .append(endTime, lesson.endTime)
+                .append(date, lesson.date)
+                .isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+        return new HashCodeBuilder(17, 37)
+                .append(number)
+                .append(startTime)
+                .append(endTime)
+                .append(date)
+                .toHashCode();
+    }
+
     /**
      * Convenient call for {@link org.greenrobot.greendao.AbstractDao#delete(Object)}.
      * Entity must attached to an entity context.

app/src/main/java/io/github/wulkanowy/data/db/dao/migrations/Migration28.java

@@ -0,0 +1,20 @@
+package io.github.wulkanowy.data.db.dao.migrations;
+
+import org.greenrobot.greendao.database.Database;
+
+import io.github.wulkanowy.api.Vulcan;
+import io.github.wulkanowy.data.db.dao.DbHelper;
+import io.github.wulkanowy.data.db.shared.SharedPrefContract;
+
+public class Migration28 implements DbHelper.Migration {
+
+    @Override
+    public Integer getVersion() {
+        return 28;
+    }
+
+    @Override
+    public void runMigration(final Database db, final SharedPrefContract sharedPref, final Vulcan vulcan) throws Exception {
+        throw new Exception("No migrations");
+    }
+}

app/src/main/java/io/github/wulkanowy/data/sync/AccountSync.java

@@ -118,12 +118,12 @@ public class AccountSync {
         daoSession.getSemesterDao().insertInTx(semesterList);
     }
 
-    public void initLastUser() throws IOException, CryptoException {
+    public void initLastUser() throws CryptoException {
 
         long userId = sharedPref.getCurrentUserId();
 
         if (userId == 0) {
-            throw new IOException("Can't find saved user");
+            throw new NotRegisteredUserException("Can't find user id in SharedPreferences");
         }
 
         LogUtils.debug("Initialization current user id=" + userId);

app/src/main/java/io/github/wulkanowy/data/sync/ExamsSync.java

@@ -135,6 +135,7 @@ public class ExamsSync {
                 .where(ExamDao.Properties.DayId.eq(dayId),
                         ExamDao.Properties.EntryDate.eq(examApi.getEntryDate()),
                         ExamDao.Properties.SubjectAndGroup.eq(examApi.getSubjectAndGroup()),
+                        ExamDao.Properties.Type.eq(examApi.getType()),
                         ExamDao.Properties.Teacher.eq(examApi.getTeacher()))
                 .unique();
     }

app/src/main/java/io/github/wulkanowy/data/sync/NotRegisteredUserException.java

@@ -0,0 +1,8 @@
+package io.github.wulkanowy.data.sync;
+
+public class NotRegisteredUserException extends RuntimeException {
+
+    public NotRegisteredUserException(String message) {
+        super(message);
+    }
+}

app/src/main/java/io/github/wulkanowy/data/sync/TimetableSync.java

@@ -1,5 +1,7 @@
 package io.github.wulkanowy.data.sync;
 
+import org.apache.commons.collections4.CollectionUtils;
+
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -125,6 +127,16 @@ public class TimetableSync {
         List<TimetableLesson> lessonsFromApiEntities = DataObjectConverter
                 .lessonsToTimetableLessonsEntities(lessons);
 
+        List<TimetableLesson> lessonsFromDbEntities = getLessonsFromDb(dayId);
+
+        if (!lessonsFromDbEntities.isEmpty()) {
+            List<TimetableLesson> lessonToRemove = new ArrayList<>(CollectionUtils.removeAll(lessonsFromDbEntities, lessonsFromApiEntities));
+
+            for (TimetableLesson timetableLesson : lessonToRemove) {
+                daoSession.getTimetableLessonDao().delete(timetableLesson);
+            }
+        }
+
         for (TimetableLesson apiLessonEntity : lessonsFromApiEntities) {
             TimetableLesson lessonFromDb = getLessonFromDb(apiLessonEntity, dayId);
 
@@ -148,4 +160,8 @@ public class TimetableSync {
                         TimetableLessonDao.Properties.EndTime.eq(apiEntity.getEndTime()))
                 .unique();
     }
+
+    private List<TimetableLesson> getLessonsFromDb(long dayId) {
+        return daoSession.getDayDao().load(dayId).getTimetableLessons();
+    }
 }

app/src/main/java/io/github/wulkanowy/services/jobs/SyncJob.java

@@ -24,6 +24,7 @@ import io.github.wulkanowy.R;
 import io.github.wulkanowy.WulkanowyApp;
 import io.github.wulkanowy.data.RepositoryContract;
 import io.github.wulkanowy.data.db.dao.entities.Grade;
+import io.github.wulkanowy.data.sync.NotRegisteredUserException;
 import io.github.wulkanowy.services.notifies.GradeNotify;
 import io.github.wulkanowy.ui.main.MainActivity;
 import io.github.wulkanowy.utils.LogUtils;
@@ -74,9 +75,12 @@ public class SyncJob extends SimpleJobService {
                 showNotification();
             }
             return JobService.RESULT_SUCCESS;
+        } catch (NotRegisteredUserException e) {
+            logError(e);
+            stop(getApplicationContext());
+            return JobService.RESULT_FAIL_NORETRY;
         } catch (Exception e) {
-            Crashlytics.logException(e);
-            LogUtils.error("During background synchronization an error occurred", e);
+            logError(e);
             return JobService.RESULT_FAIL_RETRY;
         }
     }
@@ -116,4 +120,9 @@ public class SyncJob extends SimpleJobService {
                     gradeList.size(), gradeList.size());
         }
     }
+
+    private void logError(Exception e) {
+        Crashlytics.logException(e);
+        LogUtils.error("During background synchronization an error occurred", e);
+    }
 }

app/src/main/java/io/github/wulkanowy/ui/main/exams/ExamsTabFragment.java

@@ -135,7 +135,7 @@ public class ExamsTabFragment extends BaseFragment implements ExamsTabContract.V
 
     @Override
     public void onDestroyView() {
-        super.onDestroyView();
         presenter.onDestroy();
+        super.onDestroyView();
     }
 }

app/src/main/java/io/github/wulkanowy/ui/main/timetable/TimetableSubItem.java

@@ -106,7 +106,7 @@ public class TimetableSubItem
 
             lessonName.setText(lesson.getSubject());
             lessonTime.setText(getLessonTimeString());
-            numberOfLesson.setText(lesson.getNumber());
+            numberOfLesson.setText(String.valueOf(lesson.getNumber()));
             room.setText(getRoomString());
             alert.setVisibility(lesson.getMovedOrCanceled() || lesson.getNewMovedInOrChanged()
                     ? View.VISIBLE : View.INVISIBLE);

app/src/main/java/io/github/wulkanowy/ui/splash/SplashActivity.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import javax.inject.Inject;
 
 import butterknife.ButterKnife;
-import io.github.wulkanowy.services.jobs.SyncJob;
 import io.github.wulkanowy.services.notifies.NotificationService;
 import io.github.wulkanowy.ui.base.BaseActivity;
 import io.github.wulkanowy.ui.login.LoginActivity;
@@ -48,9 +47,4 @@ public class SplashActivity extends BaseActivity implements SplashContract.View
     public void cancelNotifications() {
         new NotificationService(getApplicationContext()).cancelAll();
     }
-
-    @Override
-    public void stopSyncService() {
-        SyncJob.stop(getApplicationContext());
-    }
 }

app/src/main/java/io/github/wulkanowy/ui/splash/SplashContract.java

@@ -13,8 +13,6 @@ public interface SplashContract {
         void openMainActivity();
 
         void cancelNotifications();
-
-        void stopSyncService();
     }
 
     @PerActivity

app/src/main/java/io/github/wulkanowy/ui/splash/SplashPresenter.java

@@ -24,7 +24,6 @@ public class SplashPresenter extends BasePresenter<SplashContract.View>
             getView().openMainActivity();
         } else {
             getView().openLoginActivity();
-            getView().stopSyncService();
         }
     }
 }

app/src/main/java/io/github/wulkanowy/utils/DataObjectConverter.java

@@ -156,7 +156,7 @@ public final class DataObjectConverter {
 
         for (io.github.wulkanowy.api.generic.Lesson lesson : lessonList) {
             lessonEntityList.add(new AttendanceLesson()
-                    .setNumber(Integer.valueOf(lesson.getNumber()))
+                    .setNumber(lesson.getNumber())
                     .setSubject(lesson.getSubject())
                     .setDate(lesson.getDate())
                     .setPresence(lesson.isPresence())

app/src/main/java/io/github/wulkanowy/utils/RootChecker.java

@@ -1,38 +0,0 @@
-package io.github.wulkanowy.utils;
-
-import android.os.Build;
-
-import java.io.File;
-
-public final class RootChecker {
-
-    private RootChecker() {
-        throw new IllegalStateException("Utility class");
-    }
-
-    public static boolean isRooted() {
-        return checkOne() || checkTwo() || checkThree();
-    }
-
-    private static boolean checkOne() {
-        return Build.TAGS != null && Build.TAGS.contains("test-keys");
-    }
-
-    private static boolean checkTwo() {
-        return new File("/system/app/Superuser.apk").exists();
-    }
-
-    private static boolean checkThree() {
-        String[] commands = {"/system/xbin/which su", "/system/bin/which su", "which su"};
-        for (String command : commands) {
-            try {
-                Runtime.getRuntime().exec(command);
-                return true;
-            } catch (Exception e) {
-                // ignore
-            }
-        }
-        return false;
-    }
-
-}

app/src/main/java/io/github/wulkanowy/utils/security/Scrambler.java

@@ -27,7 +27,6 @@ import javax.crypto.CipherOutputStream;
 import javax.security.auth.x500.X500Principal;
 
 import io.github.wulkanowy.utils.LogUtils;
-import io.github.wulkanowy.utils.RootChecker;
 
 public final class Scrambler {
 
@@ -46,23 +45,16 @@ public final class Scrambler {
             loadKeyStore();
             generateNewKey(email, context);
             return encryptString(email, plainText);
-        } else {
-            if (RootChecker.isRooted()) {
-                return new String(Base64.encode(plainText.getBytes(), Base64.DEFAULT));
-            } else {
-                throw new UnsupportedOperationException("Stored data in this devices " +
-                        "isn't safe because android is rooted");
-            }
         }
+        return new String(Base64.encode(plainText.getBytes(), Base64.DEFAULT));
     }
 
     public static String decrypt(String email, String encryptedText) throws CryptoException {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
             loadKeyStore();
             return decryptString(email, encryptedText);
-        } else {
-            return new String(Base64.decode(encryptedText, Base64.DEFAULT));
         }
+        return new String(Base64.decode(encryptedText, Base64.DEFAULT));
     }
 
     private static void loadKeyStore() throws CryptoException {

app/src/main/play/pl-PL/listing/fulldescription

@@ -7,4 +7,4 @@ Wyróżnione cechy i funkcje:
 - Aktywne wsparcie i rozwój
 
 GitHub: https://github.com/wulkanowy/wulkanowy
-Discord: https://discord.gg/JMG2rhJ
+Discord: https://discord.gg/vccAQBr

app/src/main/play/pl-PL/whatsnew

@@ -1,4 +1,4 @@
-Wersja 0.4.2:
-- naprawiono logowanie do niestandardowych dzienników
-- naprawiono synchronizację sprawdzianów
-- naprawiono problemy z logowaniem (powinny występować rzadziej)
+Wersja 0.4.3:
+- naprawiono błąd z pokazywaniem usuniętych lekcji w planie
+- naprawiono drobne błędy z wyrównaniem tekstu na starszych urządzeniach
+- poprawiono synchronizację w tle spowodowaną błędem w komunikacji z serwerem

app/src/main/res/layout/activity_login.xml

@@ -25,7 +25,7 @@
             style="?android:attr/progressBarStyleHorizontal"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
+            android:layout_below="@id/login_activity_progress_text"
             android:layout_centerHorizontal="true"
             android:indeterminate="true"
             android:minHeight="30dp"
@@ -35,9 +35,9 @@
             android:id="@+id/login_activity_progress_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/login_activity_progress_bar"
             android:layout_centerHorizontal="true"
-            android:layout_marginBottom="42dp" />
+            android:layout_marginBottom="15dp"
+            android:text="@string/app_name" />
     </RelativeLayout>
 
     <ScrollView

app/src/main/res/layout/fragment_attendance_tab.xml

@@ -44,7 +44,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="46dp"
             android:text="@string/attendance_no_entries"
-            android:textAlignment="center"
+            android:gravity="center"
             android:textSize="20sp" />
     </RelativeLayout>
 

app/src/main/res/layout/fragment_exams_tab.xml

@@ -43,8 +43,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="46dp"
+            android:gravity="center"
             android:text="@string/exams_no_entries"
-            android:textAlignment="center"
             android:textSize="20sp" />
 
     </RelativeLayout>

app/src/main/res/layout/fragment_grades.xml

@@ -31,7 +31,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="46dp"
             android:text="@string/fragment_no_grades"
-            android:textAlignment="center"
+            android:gravity="center"
             android:textSize="20sp" />
     </RelativeLayout>
 

app/src/main/res/layout/fragment_timetable_tab.xml

@@ -1,6 +1,6 @@
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/timetable_tab_fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -43,19 +43,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="46dp"
+            android:gravity="center"
             android:text="@string/info_free_week"
-            android:textAlignment="center"
             android:textSize="20sp" />
 
         <TextView
             android:id="@+id/timetable_tab_fragment_no_item_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:textSize="20sp"
             android:layout_below="@id/timetable_tab_fragment_no_item_image"
+            android:layout_marginTop="15dp"
+            android:text="@string/app_name"
             android:textAlignment="center"
-            android:layout_marginTop="15dp" />
+            android:textSize="20sp" />
     </RelativeLayout>
 
     <android.support.v4.widget.SwipeRefreshLayout