Skip to content

Commit

Permalink
Fix various crashes and errors
Browse files Browse the repository at this point in the history
  • Loading branch information
knosseir committed Sep 14, 2018
1 parent e2ec4c6 commit 414344f
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 61 deletions.
22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

9 changes: 5 additions & 4 deletions .idea/misc.xml

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

2 changes: 1 addition & 1 deletion .idea/vcs.xml

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

44 changes: 22 additions & 22 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ repositories {
}

android {
compileSdkVersion 27
buildToolsVersion "27.0.2"
compileSdkVersion 28
buildToolsVersion "28.0.2"
defaultConfig {
applicationId "com.knosseir.admin.bruinfeed"
minSdkVersion 14
targetSdkVersion 27
versionCode 14
versionName "1.2.0"
targetSdkVersion 28
versionCode 15
versionName "1.2.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
multiDexEnabled = true
Expand All @@ -37,25 +37,25 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(include: ['*.jar'], dir: 'libs')
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile "com.android.support:support-core-utils:27.0.2"
compile 'com.android.support:appcompat-v7:27.0.2'
compile 'com.android.support:design:27.0.2'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'org.jsoup:jsoup:1.11.1'
compile 'com.android.support:support-vector-drawable:27.0.2'
compile 'com.android.support:recyclerview-v7:27.0.2'
compile 'com.google.android.gms:play-services-location:11.8.0'
compile 'com.google.android.gms:play-services-maps:11.8.0'
compile 'com.miguelcatalan:materialsearchview:1.4.0'
compile 'com.google.firebase:firebase-core:11.8.0'
compile 'com.github.apl-devs:appintro:v4.2.2'
compile 'com.firebase:firebase-jobdispatcher:0.8.1'
testCompile 'junit:junit:4.12'
compile('com.crashlytics.sdk.android:crashlytics:2.7.0@aar') {
implementation "com.android.support:support-core-utils:28.0.0-rc02"
implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
implementation 'com.android.support:design:28.0.0-rc02'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'org.jsoup:jsoup:1.11.1'
implementation 'com.android.support:support-vector-drawable:28.0.0-rc02'
implementation 'com.android.support:recyclerview-v7:28.0.0-rc02'
implementation 'com.google.android.gms:play-services-location:15.0.1'
implementation 'com.google.android.gms:play-services-maps:15.0.1'
implementation 'com.miguelcatalan:materialsearchview:1.4.0'
implementation 'com.google.firebase:firebase-core:16.0.3'
implementation 'com.github.apl-devs:appintro:v4.2.2'
implementation 'com.firebase:firebase-jobdispatcher:0.8.1'
testImplementation 'junit:junit:4.12'
implementation('com.crashlytics.sdk.android:crashlytics:2.7.0@aar') {
transitive = true;
}
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<application
android:allowBackup="true"
android:usesCleartextTraffic="true"
android:icon="@mipmap/launcher_icon"
android:label="@string/app_name"
android:roundIcon="@mipmap/launcher_icon"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

public class DatabaseHandler extends SQLiteOpenHelper {

private static final int DATABASE_VERSION = 8;
private static final int DATABASE_VERSION = 9;

// Database Name
private static String DATABASE_NAME = "mealItemManager";
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/com/knosseir/admin/bruinfeed/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,12 @@ public void onRefresh() {
);
}

@Override
protected void onDestroy() {
super.onDestroy();
progress.dismiss();
}

@Override
public void onBackPressed() {
DrawerLayout drawer = findViewById(R.id.drawer_layout);
Expand Down Expand Up @@ -426,16 +432,12 @@ protected Void doInBackground(String... params) {

getActivityLevels(doc);

updateRecyclerView();

} catch (SocketTimeoutException e) {
Log.e(MainTag, e.toString());
updateRecyclerView();
reload(R.string.connection_timeout);
return null;
} catch (IOException | IllegalArgumentException e) {
Log.e(MainTag, e.toString());
updateRecyclerView();
reload(R.string.retry_connection);
return null;
}
Expand All @@ -445,6 +447,7 @@ protected Void doInBackground(String... params) {

@Override
protected void onPostExecute(Void result) {
updateRecyclerView();
progress.dismiss();
}

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.android.tools.build:gradle:3.1.4'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.google.gms:google-services:3.0.0'
classpath 'com.google.gms:google-services:3.2.0'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Nov 03 19:58:02 PDT 2017
#Fri Sep 14 01:24:57 PDT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 comments on commit 414344f

Please sign in to comment.